From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: eric.dong@intel.com) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Mon, 15 Jul 2019 00:04:13 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jul 2019 00:04:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,493,1557212400"; d="scan'208";a="342306027" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 15 Jul 2019 00:04:08 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 15 Jul 2019 00:04:08 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 15 Jul 2019 00:04:08 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.3]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.240]) with mapi id 14.03.0439.000; Mon, 15 Jul 2019 15:04:06 +0800 From: "Dong, Eric" To: "Ni, Ray" , "devel@edk2.groups.io" , "Zeng, Star" CC: Laszlo Ersek , "Kumar, Chandana C" Subject: Re: [edk2-devel] [Patch 2/2] UefiCpuPkg/Library/RegisterCpuFeaturesLib: avoid use dynamic PCD. Thread-Topic: [edk2-devel] [Patch 2/2] UefiCpuPkg/Library/RegisterCpuFeaturesLib: avoid use dynamic PCD. Thread-Index: AQHVOFSljzkHA0Q1u0Ster/r/FmJR6bLCR5wgAA8/RA= Date: Mon, 15 Jul 2019 07:04:05 +0000 Message-ID: References: <20190712015308.26492-1-eric.dong@intel.com> <20190712015308.26492-3-eric.dong@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C22D06D@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C22D06D@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: eric.dong@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Star & Ray, Thanks for your comments, updated the related code. Please check my v2 cha= nges. Thanks, Eric > -----Original Message----- > From: Ni, Ray > Sent: Monday, July 15, 2019 12:58 PM > To: devel@edk2.groups.io; Dong, Eric > Cc: Laszlo Ersek ; Kumar, Chandana C > ; Zeng, Star > Subject: RE: [edk2-devel] [Patch 2/2] > UefiCpuPkg/Library/RegisterCpuFeaturesLib: avoid use dynamic PCD. >=20 > 1. FeatureMaskSize can be BitMaskSize. It clearly tells the caller that = this > function will assume bit size of SupportedFeatureMask is the same as tha= t of > PcdCpuFeaturesCapability. >=20 > SetCapabilityPcd ( > IN UINT8 *SupportedFeatureMask, > IN UINTN FeatureMaskSize >=20 > 2. IsBitMaskMatchCheck () returns TRUE when the bits in FeatureMask and > DependentBitMask overlap. We cannot change its behavior using > CompareMem. >=20 > > -----Original Message----- > > From: devel@edk2.groups.io On Behalf Of Dong, > > Eric > > Sent: Friday, July 12, 2019 9:53 AM > > To: devel@edk2.groups.io > > Cc: Ni, Ray ; Laszlo Ersek ; > > Kumar, Chandana C ; Zeng, Star > > > > Subject: [edk2-devel] [Patch 2/2] > > UefiCpuPkg/Library/RegisterCpuFeaturesLib: avoid use dynamic PCD. > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1972 > > > > Function in this library may be used by APs. Assert will be trig if AP > > uses dynamic pcd. > > This patch enhance the current code, remove the unnecessary usage of > > dynamic PCD. This change try to avoid report this issue again later. > > > > Cc: Ray Ni > > Cc: Laszlo Ersek > > Cc: Chandana Kumar > > Cc: Star Zeng > > Signed-off-by: Eric Dong > > --- > > .../CpuFeaturesInitialize.c | 64 +++++----- > > .../RegisterCpuFeatures.h | 10 +- > > .../RegisterCpuFeaturesLib.c | 114 ++++++-----------= - > > 3 files changed, 77 insertions(+), 111 deletions(-) > > > > diff --git > > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > > index 87bfc64250..16b99c0c27 100644 > > --- > > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > > +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize. > > +++ c > > @@ -21,16 +21,12 @@ CHAR16 *mRegisterTypeStr[] =3D {L"MSR", L"CR", > > L"MMIO", L"CACHE", L"SEMAP", L"INVA VOID SetCapabilityPcd ( > > IN UINT8 *SupportedFeatureMask, > > - IN UINT32 FeatureMaskSize > > + IN UINTN FeatureMaskSize > > ) > > { > > EFI_STATUS Status; > > - UINTN BitMaskSize; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesCapability); > > - ASSERT (FeatureMaskSize =3D=3D BitMaskSize); > > - > > - Status =3D PcdSetPtrS (PcdCpuFeaturesCapability, &BitMaskSize, > > SupportedFeatureMask); > > + Status =3D PcdSetPtrS (PcdCpuFeaturesCapability, &FeatureMaskSize, > > + SupportedFeatureMask); > > ASSERT_EFI_ERROR (Status); > > } > > > > @@ -38,16 +34,16 @@ SetCapabilityPcd ( > > Worker function to save PcdCpuFeaturesSetting. > > > > @param[in] SupportedFeatureMask The pointer to CPU feature bits > > mask buffer > > + @param[in] FeatureMaskSize CPU feature bits mask buffer size= . > > **/ > > VOID > > SetSettingPcd ( > > - IN UINT8 *SupportedFeatureMask > > + IN UINT8 *SupportedFeatureMask, > > + IN UINTN BitMaskSize > > ) > > { > > EFI_STATUS Status; > > - UINTN BitMaskSize; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > Status =3D PcdSetPtrS (PcdCpuFeaturesSetting, &BitMaskSize, > > SupportedFeatureMask); > > ASSERT_EFI_ERROR (Status); > > } > > @@ -272,19 +268,20 @@ SupportedMaskOr ( > > > > @param[in] SupportedFeatureMask The pointer to CPU feature bits > > mask buffer > > @param[in] AndFeatureBitMask The feature bit mask to do AND > > operation > > + @param[in] BitMaskSize CPU feature bits mask buffer size= . > > + > > **/ > > VOID > > SupportedMaskAnd ( > > IN UINT8 *SupportedFeatureMask, > > - IN CONST UINT8 *AndFeatureBitMask > > + IN CONST UINT8 *AndFeatureBitMask, > > + IN UINT32 BitMaskSize > > ) > > { > > UINTN Index; > > - UINTN BitMaskSize; > > UINT8 *Data1; > > CONST UINT8 *Data2; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > Data1 =3D SupportedFeatureMask; > > Data2 =3D AndFeatureBitMask; > > for (Index =3D 0; Index < BitMaskSize; Index++) { @@ -297,19 +294,1= 9 > > @@ SupportedMaskAnd ( > > > > @param[in] SupportedFeatureMask The pointer to CPU feature bits > > mask buffer > > @param[in] AndFeatureBitMask The feature bit mask to do XOR > > operation > > + @param[in] BitMaskSize CPU feature bits mask buffer size= . > > **/ > > VOID > > SupportedMaskCleanBit ( > > IN UINT8 *SupportedFeatureMask, > > - IN UINT8 *AndFeatureBitMask > > + IN UINT8 *AndFeatureBitMask, > > + IN UINT32 BitMaskSize > > ) > > { > > UINTN Index; > > - UINTN BitMaskSize; > > UINT8 *Data1; > > UINT8 *Data2; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > Data1 =3D SupportedFeatureMask; > > Data2 =3D AndFeatureBitMask; > > for (Index =3D 0; Index < BitMaskSize; Index++) { @@ -323,6 +320,7 = @@ > > SupportedMaskCleanBit ( > > > > @param[in] SupportedFeatureMask The pointer to CPU feature bits > mask > > buffer > > @param[in] ComparedFeatureBitMask The feature bit mask to be > > compared > > + @param[in] BitMaskSize CPU feature bits mask buffer siz= e. > > > > @retval TRUE The ComparedFeatureBitMask is set in CPU feature > > supported bits > > mask buffer. > > @@ -332,16 +330,14 @@ SupportedMaskCleanBit ( BOOLEAN > IsBitMaskMatch > > ( > > IN UINT8 *SupportedFeatureMask, > > - IN UINT8 *ComparedFeatureBitMask > > + IN UINT8 *ComparedFeatureBitMask, > > + IN UINT32 BitMaskSize > > ) > > { > > UINTN Index; > > - UINTN BitMaskSize; > > UINT8 *Data1; > > UINT8 *Data2; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > - > > Data1 =3D SupportedFeatureMask; > > Data2 =3D ComparedFeatureBitMask; > > for (Index =3D 0; Index < BitMaskSize; Index++) { @@ -557,14 +553,1= 4 > > @@ AnalysisProcessorFeatures ( > > // > > // Calculate the last capability on all processors > > // > > - SupportedMaskAnd (CpuFeaturesData->CapabilityPcd, CpuInitOrder- > > >FeaturesSupportedMask); > > + SupportedMaskAnd (CpuFeaturesData->CapabilityPcd, > > + CpuInitOrder->FeaturesSupportedMask, CpuFeaturesData- > >BitMaskSize); > > } > > // > > // Calculate the last setting > > // > > CpuFeaturesData->SettingPcd =3D AllocateCopyPool (CpuFeaturesData- > > >BitMaskSize, CpuFeaturesData->CapabilityPcd); > > ASSERT (CpuFeaturesData->SettingPcd !=3D NULL); > > - SupportedMaskAnd (CpuFeaturesData->SettingPcd, PcdGetPtr > > (PcdCpuFeaturesSetting)); > > + SupportedMaskAnd (CpuFeaturesData->SettingPcd, PcdGetPtr > > + (PcdCpuFeaturesSetting), CpuFeaturesData->BitMaskSize); > > > > // > > // Dump the last CPU feature list > > @@ -574,8 +570,8 @@ AnalysisProcessorFeatures ( > > Entry =3D GetFirstNode (&CpuFeaturesData->FeatureList); > > while (!IsNull (&CpuFeaturesData->FeatureList, Entry)) { > > CpuFeature =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); > > - if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData- > > >CapabilityPcd)) { > > - if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData- > > >SettingPcd)) { > > + if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData- > > >CapabilityPcd, CpuFeaturesData->BitMaskSize)) { > > + if (IsBitMaskMatch (CpuFeature->FeatureMask, > > + CpuFeaturesData->SettingPcd, CpuFeaturesData->BitMaskSize)) { > > DEBUG ((DEBUG_INFO, "[Enable ] ")); > > } else { > > DEBUG ((DEBUG_INFO, "[Disable ] ")); @@ -583,22 +579,22 @@ > > AnalysisProcessorFeatures ( > > } else { > > DEBUG ((DEBUG_INFO, "[Unsupport] ")); > > } > > - DumpCpuFeature (CpuFeature); > > + DumpCpuFeature (CpuFeature, CpuFeaturesData->BitMaskSize); > > Entry =3D Entry->ForwardLink; > > } > > DEBUG ((DEBUG_INFO, "PcdCpuFeaturesCapability:\n")); > > - DumpCpuFeatureMask (CpuFeaturesData->CapabilityPcd); > > + DumpCpuFeatureMask (CpuFeaturesData->CapabilityPcd, > > + CpuFeaturesData->BitMaskSize); > > DEBUG ((DEBUG_INFO, "Origin PcdCpuFeaturesSetting:\n")); > > - DumpCpuFeatureMask (PcdGetPtr (PcdCpuFeaturesSetting)); > > + DumpCpuFeatureMask (PcdGetPtr (PcdCpuFeaturesSetting), > > + CpuFeaturesData->BitMaskSize); > > DEBUG ((DEBUG_INFO, "Final PcdCpuFeaturesSetting:\n")); > > - DumpCpuFeatureMask (CpuFeaturesData->SettingPcd); > > + DumpCpuFeatureMask (CpuFeaturesData->SettingPcd, > > + CpuFeaturesData->BitMaskSize); > > ); > > > > // > > // Save PCDs and display CPU PCDs > > // > > SetCapabilityPcd (CpuFeaturesData->CapabilityPcd, CpuFeaturesData- > > >BitMaskSize); > > - SetSettingPcd (CpuFeaturesData->SettingPcd); > > + SetSettingPcd (CpuFeaturesData->SettingPcd, > > + CpuFeaturesData->BitMaskSize); > > > > for (ProcessorNumber =3D 0; ProcessorNumber < NumberOfCpus; > > ProcessorNumber++) { > > CpuInitOrder =3D &CpuFeaturesData->InitOrder[ProcessorNumber]; > > @@ -608,7 +604,7 @@ AnalysisProcessorFeatures ( > > // Insert each feature into processor's order list > > // > > CpuFeature =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); > > - if (IsBitMaskMatch (CpuFeature->FeatureMask, CpuFeaturesData- > > >CapabilityPcd)) { > > + if (IsBitMaskMatch (CpuFeature->FeatureMask, > > + CpuFeaturesData->CapabilityPcd, CpuFeaturesData->BitMaskSize)) { > > CpuFeatureInOrder =3D AllocateCopyPool (sizeof > > (CPU_FEATURES_ENTRY), CpuFeature); > > ASSERT (CpuFeatureInOrder !=3D NULL); > > InsertTailList (&CpuInitOrder->OrderList, > > &CpuFeatureInOrder->Link); @@ -624,18 +620,18 @@ > AnalysisProcessorFeatures ( > > CpuFeatureInOrder =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); > > > > Success =3D FALSE; > > - if (IsBitMaskMatch (CpuFeatureInOrder->FeatureMask, > > CpuFeaturesData->SettingPcd)) { > > + if (IsBitMaskMatch (CpuFeatureInOrder->FeatureMask, > > + CpuFeaturesData->SettingPcd, CpuFeaturesData->BitMaskSize)) { > > Status =3D CpuFeatureInOrder->InitializeFunc (ProcessorNumber= , > > CpuInfo, > > CpuFeatureInOrder->ConfigData, TRUE); > > if (EFI_ERROR (Status)) { > > // > > // Clean the CpuFeatureInOrder->FeatureMask in setting PCD. > > // > > - SupportedMaskCleanBit (CpuFeaturesData->SettingPcd, > > CpuFeatureInOrder->FeatureMask); > > + SupportedMaskCleanBit (CpuFeaturesData->SettingPcd, > > + CpuFeatureInOrder->FeatureMask, CpuFeaturesData->BitMaskSize); > > if (CpuFeatureInOrder->FeatureName !=3D NULL) { > > DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature: > > Name =3D %a.\n", CpuFeatureInOrder->FeatureName)); > > } else { > > DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature: > > Mask =3D ")); > > - DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask); > > + DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask, > > + CpuFeaturesData->BitMaskSize); > > } > > } else { > > Success =3D TRUE; > > @@ -647,7 +643,7 @@ AnalysisProcessorFeatures ( > > DEBUG ((DEBUG_WARN, "Warning :: Failed to disable > > Feature: Name =3D %a.\n", CpuFeatureInOrder->FeatureName)); > > } else { > > DEBUG ((DEBUG_WARN, "Warning :: Failed to disable > > Feature: Mask =3D ")); > > - DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask); > > + DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask, > > + CpuFeaturesData->BitMaskSize); > > } > > } else { > > Success =3D TRUE; > > @@ -699,7 +695,7 @@ AnalysisProcessorFeatures ( > > // again during initialize the features. > > // > > DEBUG ((DEBUG_INFO, "Dump final value for > > PcdCpuFeaturesSetting:\n")); > > - DumpCpuFeatureMask (CpuFeaturesData->SettingPcd); > > + DumpCpuFeatureMask (CpuFeaturesData->SettingPcd, > > + CpuFeaturesData->BitMaskSize); > > > > // > > // Dump the RegisterTable > > diff --git > > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h > > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h > > index 5c546ee153..a18f926641 100644 > > --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h > > +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h > > @@ -180,20 +180,26 @@ SwitchNewBsp ( > > Function that uses DEBUG() macros to display the contents of a a > > CPU feature bit mask. > > > > @param[in] FeatureMask A pointer to the CPU feature bit mask. > > + @param[in] BitMaskSize CPU feature bits mask buffer size. > > + > > **/ > > VOID > > DumpCpuFeatureMask ( > > - IN UINT8 *FeatureMask > > + IN UINT8 *FeatureMask, > > + IN UINT32 BitMaskSize > > ); > > > > /** > > Dump CPU feature name or CPU feature bit mask. > > > > @param[in] CpuFeature Pointer to CPU_FEATURES_ENTRY > > + @param[in] BitMaskSize CPU feature bits mask buffer size. > > + > > **/ > > VOID > > DumpCpuFeature ( > > - IN CPU_FEATURES_ENTRY *CpuFeature > > + IN CPU_FEATURES_ENTRY *CpuFeature, > > + IN UINT32 BitMaskSize > > ); > > > > /** > > diff --git > > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > > index 36aabd7267..283e9d6539 100644 > > --- > > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > > +++ > > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > > @@ -18,36 +18,34 @@ > > @retval FALSE Two CPU feature bit masks are not equal. > > **/ > > BOOLEAN > > -IsCpuFeatureMatch ( > > +IsBitMaskMatchCheck ( > > IN UINT8 *FirstFeatureMask, > > IN UINT8 *SecondFeatureMask > > ) > > { > > - UINTN BitMaskSize; > > + CPU_FEATURES_DATA *CpuFeaturesData; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > - if (CompareMem (FirstFeatureMask, SecondFeatureMask, BitMaskSize) > > =3D=3D > > 0) { > > - return TRUE; > > - } else { > > - return FALSE; > > - } > > + CpuFeaturesData =3D GetCpuFeaturesData (); > > + > > + return (CompareMem (FirstFeatureMask, SecondFeatureMask, > > + CpuFeaturesData->BitMaskSize) =3D=3D 0); > > } > > > > /** > > Function that uses DEBUG() macros to display the contents of a a > > CPU feature bit mask. > > > > @param[in] FeatureMask A pointer to the CPU feature bit mask. > > + @param[in] BitMaskSize CPU feature bits mask buffer size. > > + > > **/ > > VOID > > DumpCpuFeatureMask ( > > - IN UINT8 *FeatureMask > > + IN UINT8 *FeatureMask, > > + IN UINT32 BitMaskSize > > ) > > { > > UINTN Index; > > UINT8 *Data8; > > - UINTN BitMaskSize; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > Data8 =3D (UINT8 *) FeatureMask; > > for (Index =3D 0; Index < BitMaskSize; Index++) { > > DEBUG ((DEBUG_INFO, " %02x ", *Data8++)); @@ -59,10 +57,13 @@ > > DumpCpuFeatureMask ( > > Dump CPU feature name or CPU feature bit mask. > > > > @param[in] CpuFeature Pointer to CPU_FEATURES_ENTRY > > + @param[in] BitMaskSize CPU feature bits mask buffer size. > > + > > **/ > > VOID > > DumpCpuFeature ( > > - IN CPU_FEATURES_ENTRY *CpuFeature > > + IN CPU_FEATURES_ENTRY *CpuFeature, > > + IN UINT32 BitMaskSize > > ) > > { > > > > @@ -70,42 +71,10 @@ DumpCpuFeature ( > > DEBUG ((DEBUG_INFO, "FeatureName: %a\n", CpuFeature- > > >FeatureName)); > > } else { > > DEBUG ((DEBUG_INFO, "FeatureMask =3D ")); > > - DumpCpuFeatureMask (CpuFeature->FeatureMask); > > + DumpCpuFeatureMask (CpuFeature->FeatureMask, BitMaskSize); > > } > > } > > > > -/** > > - Determines if the feature bit mask is in dependent CPU feature bit > > mask buffer. > > - > > - @param[in] FeatureMask Pointer to CPU feature bit mask > > - @param[in] DependentBitMask Pointer to dependent CPU feature bit > > mask buffer > > - > > - @retval TRUE The feature bit mask is in dependent CPU feature bit > > mask buffer. > > - @retval FALSE The feature bit mask is not in dependent CPU feature > > bit mask buffer. > > -**/ > > -BOOLEAN > > -IsBitMaskMatchCheck ( > > - IN UINT8 *FeatureMask, > > - IN UINT8 *DependentBitMask > > - ) > > -{ > > - UINTN Index; > > - UINTN BitMaskSize; > > - UINT8 *Data1; > > - UINT8 *Data2; > > - > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > - > > - Data1 =3D FeatureMask; > > - Data2 =3D DependentBitMask; > > - for (Index =3D 0; Index < BitMaskSize; Index++) { > > - if (((*(Data1++)) & (*(Data2++))) !=3D 0) { > > - return TRUE; > > - } > > - } > > - return FALSE; > > -} > > - > > /** > > Try to find the specify cpu featuren in former/after feature list. > > > > @@ -642,37 +611,21 @@ CheckCpuFeaturesDependency ( **/ > RETURN_STATUS > > RegisterCpuFeatureWorker ( > > + IN CPU_FEATURES_DATA *CpuFeaturesData, > > IN CPU_FEATURES_ENTRY *CpuFeature > > ) > > { > > EFI_STATUS Status; > > - CPU_FEATURES_DATA *CpuFeaturesData; > > CPU_FEATURES_ENTRY *CpuFeatureEntry; > > LIST_ENTRY *Entry; > > - UINTN BitMaskSize; > > BOOLEAN FeatureExist; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > - CpuFeaturesData =3D GetCpuFeaturesData (); > > - if (CpuFeaturesData->FeaturesCount =3D=3D 0) { > > - InitializeListHead (&CpuFeaturesData->FeatureList); > > - InitializeSpinLock (&CpuFeaturesData->CpuFlags.MemoryMappedLock); > > - InitializeSpinLock (&CpuFeaturesData->CpuFlags.ConsoleLogLock); > > - // > > - // Driver has assumption that these three PCD should has same buf= fer > size. > > - // > > - ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize > > (PcdCpuFeaturesCapability)); > > - ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize > > (PcdCpuFeaturesSupport)); > > - CpuFeaturesData->BitMaskSize =3D (UINT32) BitMaskSize; > > - } > > - ASSERT (CpuFeaturesData->BitMaskSize =3D=3D BitMaskSize); > > - > > FeatureExist =3D FALSE; > > CpuFeatureEntry =3D NULL; > > Entry =3D GetFirstNode (&CpuFeaturesData->FeatureList); > > while (!IsNull (&CpuFeaturesData->FeatureList, Entry)) { > > CpuFeatureEntry =3D CPU_FEATURE_ENTRY_FROM_LINK (Entry); > > - if (IsCpuFeatureMatch (CpuFeature->FeatureMask, CpuFeatureEntry- > > >FeatureMask)) { > > + if (IsBitMaskMatchCheck (CpuFeature->FeatureMask, > > + CpuFeatureEntry->FeatureMask)) { > > // > > // If this feature already registered > > // > > @@ -684,12 +637,12 @@ RegisterCpuFeatureWorker ( > > > > if (!FeatureExist) { > > DEBUG ((DEBUG_INFO, "[NEW] ")); > > - DumpCpuFeature (CpuFeature); > > + DumpCpuFeature (CpuFeature, CpuFeaturesData->BitMaskSize); > > InsertTailList (&CpuFeaturesData->FeatureList, &CpuFeature->Link)= ; > > CpuFeaturesData->FeaturesCount++; > > } else { > > DEBUG ((DEBUG_INFO, "[OVERRIDE] ")); > > - DumpCpuFeature (CpuFeature); > > + DumpCpuFeature (CpuFeature, CpuFeaturesData->BitMaskSize); > > ASSERT (CpuFeatureEntry !=3D NULL); > > // > > // Overwrite original parameters of CPU feature @@ -849,7 +802,6 > > @@ RegisterCpuFeature ( > > EFI_STATUS Status; > > VA_LIST Marker; > > UINT32 Feature; > > - UINTN BitMaskSize; > > CPU_FEATURES_ENTRY *CpuFeature; > > UINT8 *FeatureMask; > > UINT8 *BeforeFeatureBitMask; > > @@ -860,6 +812,7 @@ RegisterCpuFeature ( > > UINT8 *PackageAfterFeatureBitMask; > > BOOLEAN BeforeAll; > > BOOLEAN AfterAll; > > + CPU_FEATURES_DATA *CpuFeaturesData; > > > > FeatureMask =3D NULL; > > BeforeFeatureBitMask =3D NULL; > > @@ -871,7 +824,18 @@ RegisterCpuFeature ( > > BeforeAll =3D FALSE; > > AfterAll =3D FALSE; > > > > - BitMaskSize =3D PcdGetSize (PcdCpuFeaturesSetting); > > + CpuFeaturesData =3D GetCpuFeaturesData (); if > > + (CpuFeaturesData->FeaturesCount =3D=3D 0) { > > + InitializeListHead (&CpuFeaturesData->FeatureList); > > + InitializeSpinLock (&CpuFeaturesData->CpuFlags.MemoryMappedLock); > > + InitializeSpinLock (&CpuFeaturesData->CpuFlags.ConsoleLogLock); > > + // > > + // Driver has assumption that below three PCDs should has same > > + buffer > > size. > > + // > > + ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize > > (PcdCpuFeaturesCapability)); > > + ASSERT (PcdGetSize (PcdCpuFeaturesSetting) =3D=3D PcdGetSize > > (PcdCpuFeaturesSupport)); > > + CpuFeaturesData->BitMaskSize =3D (UINT32) PcdGetSize > > + (PcdCpuFeaturesSetting); } > > > > VA_START (Marker, InitializeFunc); > > Feature =3D VA_ARG (Marker, UINT32); > > @@ -889,19 +853,19 @@ RegisterCpuFeature ( > > AfterAll =3D ((Feature & CPU_FEATURE_AFTER_ALL) !=3D 0) ? TRUE= : FALSE; > > Feature &=3D ~(CPU_FEATURE_BEFORE_ALL | > CPU_FEATURE_AFTER_ALL); > > ASSERT (FeatureMask =3D=3D NULL); > > - SetCpuFeaturesBitMask (&FeatureMask, Feature, BitMaskSize); > > + SetCpuFeaturesBitMask (&FeatureMask, Feature, > > + CpuFeaturesData->BitMaskSize); > > } else if ((Feature & CPU_FEATURE_BEFORE) !=3D 0) { > > - SetCpuFeaturesBitMask (&BeforeFeatureBitMask, Feature & > > ~CPU_FEATURE_BEFORE, BitMaskSize); > > + SetCpuFeaturesBitMask (&BeforeFeatureBitMask, Feature & > > + ~CPU_FEATURE_BEFORE, CpuFeaturesData->BitMaskSize); > > } else if ((Feature & CPU_FEATURE_AFTER) !=3D 0) { > > - SetCpuFeaturesBitMask (&AfterFeatureBitMask, Feature & > > ~CPU_FEATURE_AFTER, BitMaskSize); > > + SetCpuFeaturesBitMask (&AfterFeatureBitMask, Feature & > > + ~CPU_FEATURE_AFTER, CpuFeaturesData->BitMaskSize); > > } else if ((Feature & CPU_FEATURE_CORE_BEFORE) !=3D 0) { > > - SetCpuFeaturesBitMask (&CoreBeforeFeatureBitMask, Feature & > > ~CPU_FEATURE_CORE_BEFORE, BitMaskSize); > > + SetCpuFeaturesBitMask (&CoreBeforeFeatureBitMask, Feature & > > + ~CPU_FEATURE_CORE_BEFORE, CpuFeaturesData->BitMaskSize); > > } else if ((Feature & CPU_FEATURE_CORE_AFTER) !=3D 0) { > > - SetCpuFeaturesBitMask (&CoreAfterFeatureBitMask, Feature & > > ~CPU_FEATURE_CORE_AFTER, BitMaskSize); > > + SetCpuFeaturesBitMask (&CoreAfterFeatureBitMask, Feature & > > + ~CPU_FEATURE_CORE_AFTER, CpuFeaturesData->BitMaskSize); > > } else if ((Feature & CPU_FEATURE_PACKAGE_BEFORE) !=3D 0) { > > - SetCpuFeaturesBitMask (&PackageBeforeFeatureBitMask, Feature & > > ~CPU_FEATURE_PACKAGE_BEFORE, BitMaskSize); > > + SetCpuFeaturesBitMask (&PackageBeforeFeatureBitMask, Feature & > > + ~CPU_FEATURE_PACKAGE_BEFORE, CpuFeaturesData->BitMaskSize); > > } else if ((Feature & CPU_FEATURE_PACKAGE_AFTER) !=3D 0) { > > - SetCpuFeaturesBitMask (&PackageAfterFeatureBitMask, Feature & > > ~CPU_FEATURE_PACKAGE_AFTER, BitMaskSize); > > + SetCpuFeaturesBitMask (&PackageAfterFeatureBitMask, Feature & > > + ~CPU_FEATURE_PACKAGE_AFTER, CpuFeaturesData->BitMaskSize); > > } > > Feature =3D VA_ARG (Marker, UINT32); > > } > > @@ -929,7 +893,7 @@ RegisterCpuFeature ( > > ASSERT_EFI_ERROR (Status); > > } > > > > - Status =3D RegisterCpuFeatureWorker (CpuFeature); > > + Status =3D RegisterCpuFeatureWorker (CpuFeaturesData, CpuFeature); > > ASSERT_EFI_ERROR (Status); > > > > return RETURN_SUCCESS; > > -- > > 2.21.0.windows.1 > > > > > >=20