Reviewed-by: Eric Dong <[email protected]> > -----Original Message----- > From: Ni, Ray > Sent: Tuesday, July 2, 2019 3:16 PM > To: [email protected] > Cc: Dong, Eric <[email protected]>; Zeng, Star <[email protected]> > Subject: [PATCH] UefiCpuPkg/RegisterCpuFeaturesLib: Delete > CPU_FEATURE_[BEFORE|AFTER] > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1366 > > Commit b3c71b472dff2c02f0cc38d7a1959cfb2ba8420d supported MSR setting > in different scopes. It added below macro: > CPU_FEATURE_THREAD_BEFORE > CPU_FEATURE_THREAD_AFTER > CPU_FEATURE_CORE_BEFORE > CPU_FEATURE_CORE_AFTER > CPU_FEATURE_PACKAGE_BEFORE > CPU_FEATURE_PACKAGE_AFTER > > And it re-interpreted CPU_FEATURE_BEFORE as > CPU_FEATURE_THREAD_BEFORE and CPU_FEATURE_AFTER as > CPU_FEATURE_THREAD_AFTER. > > This patch retires CPU_FEATURE_BEFORE and CPU_FEATURE_AFTER > completely. > > Signed-off-by: Ray Ni <[email protected]> > Cc: Eric Dong <[email protected]> > Cc: Star Zeng <[email protected]> > --- > .../Include/Library/RegisterCpuFeaturesLib.h | 13 ++----------- > .../CpuCommonFeaturesLib/CpuCommonFeaturesLib.c | 8 ++++---- > .../RegisterCpuFeaturesLib.c | 14 +++++++------- > 3 files changed, 13 insertions(+), 22 deletions(-) > > diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > index 191348d770..6f964027be 100644 > --- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > +++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > @@ -69,17 +69,8 @@ > > #define CPU_FEATURE_BEFORE_ALL BIT23 > #define CPU_FEATURE_AFTER_ALL BIT24 > -// > -// CPU_FEATURE_BEFORE and CPU_FEATURE_AFTER only mean Thread > scope -// before and Thread scope after. > -// It will be replace with CPU_FEATURE_THREAD_BEFORE and -// > CPU_FEATURE_THREAD_AFTER, and should not be used anymore. > -// > -#define CPU_FEATURE_BEFORE BIT25 > -#define CPU_FEATURE_AFTER BIT26 > - > -#define CPU_FEATURE_THREAD_BEFORE CPU_FEATURE_BEFORE > -#define CPU_FEATURE_THREAD_AFTER CPU_FEATURE_AFTER > +#define CPU_FEATURE_THREAD_BEFORE BIT25 > +#define CPU_FEATURE_THREAD_AFTER BIT26 > #define CPU_FEATURE_CORE_BEFORE BIT27 > #define CPU_FEATURE_CORE_AFTER BIT28 > #define CPU_FEATURE_PACKAGE_BEFORE BIT29 > diff --git > a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c > b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c > index 7cc692efb6..7966428458 100644 > --- > a/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c > +++ > b/UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.c > @@ -2,7 +2,7 @@ > This library registers CPU features defined in Intel(R) 64 and IA-32 > Architectures Software Developer's Manual. > > - Copyright (c) 2017, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2017 - 2019, Intel Corporation. All rights > + reserved.<BR> > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -106,7 +106,7 @@ CpuCommonFeaturesLibConstructor ( > SmxSupport, > SmxInitialize, > CPU_FEATURE_SMX, > - CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | > CPU_FEATURE_BEFORE, > + CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | > + CPU_FEATURE_THREAD_BEFORE, > CPU_FEATURE_END > ); > ASSERT_EFI_ERROR (Status); > @@ -118,7 +118,7 @@ CpuCommonFeaturesLibConstructor ( > VmxSupport, > VmxInitialize, > CPU_FEATURE_VMX, > - CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | > CPU_FEATURE_BEFORE, > + CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | > + CPU_FEATURE_THREAD_BEFORE, > CPU_FEATURE_END > ); > ASSERT_EFI_ERROR (Status); > @@ -218,7 +218,7 @@ CpuCommonFeaturesLibConstructor ( > LmceSupport, > LmceInitialize, > CPU_FEATURE_LMCE, > - CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | > CPU_FEATURE_BEFORE, > + CPU_FEATURE_LOCK_FEATURE_CONTROL_REGISTER | > + CPU_FEATURE_THREAD_BEFORE, > CPU_FEATURE_END > ); > ASSERT_EFI_ERROR (Status); > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > index fa0f0b41e2..c630277d9e 100644 > --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > +++ > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > @@ -871,24 +871,24 @@ RegisterCpuFeature ( > VA_START (Marker, InitializeFunc); > Feature = VA_ARG (Marker, UINT32); > while (Feature != CPU_FEATURE_END) { > - ASSERT ((Feature & (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)) > - != (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)); > + ASSERT ((Feature & (CPU_FEATURE_THREAD_BEFORE | > CPU_FEATURE_THREAD_AFTER)) > + != (CPU_FEATURE_THREAD_BEFORE | > + CPU_FEATURE_THREAD_AFTER)); > ASSERT ((Feature & (CPU_FEATURE_BEFORE_ALL | > CPU_FEATURE_AFTER_ALL)) > != (CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL)); > ASSERT ((Feature & (CPU_FEATURE_CORE_BEFORE | > CPU_FEATURE_CORE_AFTER)) > != (CPU_FEATURE_CORE_BEFORE | CPU_FEATURE_CORE_AFTER)); > ASSERT ((Feature & (CPU_FEATURE_PACKAGE_BEFORE | > CPU_FEATURE_PACKAGE_AFTER)) > != (CPU_FEATURE_PACKAGE_BEFORE | > CPU_FEATURE_PACKAGE_AFTER)); > - if (Feature < CPU_FEATURE_BEFORE) { > + if (Feature < CPU_FEATURE_THREAD_BEFORE) { > BeforeAll = ((Feature & CPU_FEATURE_BEFORE_ALL) != 0) ? TRUE : FALSE; > AfterAll = ((Feature & CPU_FEATURE_AFTER_ALL) != 0) ? TRUE : FALSE; > Feature &= ~(CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL); > ASSERT (FeatureMask == NULL); > SetCpuFeaturesBitMask (&FeatureMask, Feature, BitMaskSize); > - } else if ((Feature & CPU_FEATURE_BEFORE) != 0) { > - SetCpuFeaturesBitMask (&BeforeFeatureBitMask, Feature & > ~CPU_FEATURE_BEFORE, BitMaskSize); > - } else if ((Feature & CPU_FEATURE_AFTER) != 0) { > - SetCpuFeaturesBitMask (&AfterFeatureBitMask, Feature & > ~CPU_FEATURE_AFTER, BitMaskSize); > + } else if ((Feature & CPU_FEATURE_THREAD_BEFORE) != 0) { > + SetCpuFeaturesBitMask (&BeforeFeatureBitMask, Feature & > ~CPU_FEATURE_THREAD_BEFORE, BitMaskSize); > + } else if ((Feature & CPU_FEATURE_THREAD_AFTER) != 0) { > + SetCpuFeaturesBitMask (&AfterFeatureBitMask, Feature & > + ~CPU_FEATURE_THREAD_AFTER, BitMaskSize); > } else if ((Feature & CPU_FEATURE_CORE_BEFORE) != 0) { > SetCpuFeaturesBitMask (&CoreBeforeFeatureBitMask, Feature & > ~CPU_FEATURE_CORE_BEFORE, BitMaskSize); > } else if ((Feature & CPU_FEATURE_CORE_AFTER) != 0) { > -- > 2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43414): https://edk2.groups.io/g/devel/message/43414 Mute This Topic: https://groups.io/mt/32283885/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
