From 330021fa41e41ef4b4aafc20e853d91179fd1b80 Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Wed, 23 Aug 2017 10:24:58 +0800 Subject: [PATCH] UefiCpuPkg/CpuCommonFeaturesLib: Remove redundant definition. The EnumProcTraceMemDisable/OutputSchemeInvalid are redundant definitions. These definitions can be handled by other code, so remove them. V2: Change enum members name. Cc: Michael Kinney Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Dong Reviewed-by: Michael Kinney --- .../Library/CpuCommonFeaturesLib/ProcTrace.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c index e4636b20db..167c1be424 100644 --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/ProcTrace.c @@ -30,10 +30,9 @@ /// Processor trace output scheme selection. /// typedef enum { - OutputSchemeSingleRange = 0, - OutputSchemeToPA, - OutputSchemeInvalid -} PROC_TRACE_OUTPUT_SCHEME; + RtitOutputSchemeSingleRange = 0, + RtitOutputSchemeToPA +} RTIT_OUTPUT_SCHEME; typedef struct { BOOLEAN ProcTraceSupported; @@ -122,7 +121,7 @@ ProcTraceSupport ( // ProcTraceData = (PROC_TRACE_DATA *) ConfigData; if ((ProcTraceData->ProcTraceMemSize > RtitTopaMemorySize128M) || - (ProcTraceData->ProcTraceOutputScheme > ProcTraceOutputSchemeToPA)) { + (ProcTraceData->ProcTraceOutputScheme > RtitOutputSchemeToPA)) { return FALSE; } @@ -138,8 +137,8 @@ ProcTraceSupport ( AsmCpuidEx (CPUID_INTEL_PROCESSOR_TRACE, CPUID_INTEL_PROCESSOR_TRACE_MAIN_LEAF, NULL, NULL, &Ecx.Uint32, NULL); ProcTraceData->ProcessorData[ProcessorNumber].TopaSupported = (BOOLEAN) (Ecx.Bits.RTIT == 1); ProcTraceData->ProcessorData[ProcessorNumber].SingleRangeSupported = (BOOLEAN) (Ecx.Bits.SingleRangeOutput == 1); - if (ProcTraceData->ProcessorData[ProcessorNumber].TopaSupported || - ProcTraceData->ProcessorData[ProcessorNumber].SingleRangeSupported) { + if ((ProcTraceData->ProcessorData[ProcessorNumber].TopaSupported && (ProcTraceData->ProcTraceOutputScheme == RtitOutputSchemeToPA)) || + (ProcTraceData->ProcessorData[ProcessorNumber].SingleRangeSupported && (ProcTraceData->ProcTraceOutputScheme == RtitOutputSchemeSingleRange))) { return TRUE; } @@ -291,7 +290,7 @@ ProcTraceInitialize ( // Single Range output scheme // if (ProcTraceData->ProcessorData[ProcessorNumber].SingleRangeSupported && - (ProcTraceData->ProcTraceOutputScheme == OutputSchemeSingleRange)) { + (ProcTraceData->ProcTraceOutputScheme == RtitOutputSchemeSingleRange)) { if (FirstIn) { DEBUG ((DEBUG_INFO, "ProcTrace: Enabling Single Range Output scheme \n")); } @@ -337,7 +336,7 @@ ProcTraceInitialize ( // ToPA(Table of physical address) scheme // if (ProcTraceData->ProcessorData[ProcessorNumber].TopaSupported && - (ProcTraceData->ProcTraceOutputScheme == OutputSchemeToPA)) { + (ProcTraceData->ProcTraceOutputScheme == RtitOutputSchemeToPA)) { // // Create ToPA structure aligned at 4KB for each logical thread // with at least 2 entries by 8 bytes size each. The first entry