Reviewed-by: Ray Ni <[email protected]> > -----Original Message----- > From: Lou, Yun <[email protected]> > Sent: Thursday, January 21, 2021 3:29 PM > To: [email protected] > Cc: Lou, Yun <[email protected]>; Kinney, Michael D > <[email protected]>; Liming Gao <[email protected]>; Liu, > Zhiguang <[email protected]>; Ni, Ray <[email protected]>; Dong, Eric > <[email protected]>; Laszlo Ersek <[email protected]>; Kumar, Rahul1 > <[email protected]> > Subject: [PATCH v2 1/1] MdePkg/Cpuid.h: Change and add some macro > definitions. > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3105 > > Change and add some macro definitions about > CPUID_HYBRID_INFORMATION Leaf(1Ah). > > Signed-off-by: Jason Lou <[email protected]> > Cc: Michael D Kinney <[email protected]> > Cc: Liming Gao <[email protected]> > Cc: Zhiguang Liu <[email protected]> > Cc: Ray Ni <[email protected]> > Cc: Eric Dong <[email protected]> > Cc: Laszlo Ersek <[email protected]> > Cc: Rahul Kumar <[email protected]> > --- > UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c | 2 +- > MdePkg/Include/Register/Intel/Cpuid.h | 17 +++++++++++++---- > 2 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c > b/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c > index 6b87be261acf..d1f9830c91e7 100644 > --- a/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c > +++ b/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c > @@ -175,7 +175,7 @@ CpuCacheInfoCollectCoreAndCacheData ( > // > > Context->ProcessorInfo[ProcessorIndex].CoreType = 0; > > if (CpuidMaxInput >= CPUID_HYBRID_INFORMATION) { > > - AsmCpuidEx (CPUID_HYBRID_INFORMATION, > CPUID_HYBRID_INFORMATION_SUB_LEAF, > &NativeModelIdAndCoreTypeEax.Uint32, NULL, NULL, NULL); > > + AsmCpuidEx (CPUID_HYBRID_INFORMATION, > CPUID_HYBRID_INFORMATION_MAIN_LEAF, > &NativeModelIdAndCoreTypeEax.Uint32, NULL, NULL, NULL); > > Context->ProcessorInfo[ProcessorIndex].CoreType = (UINT8) > NativeModelIdAndCoreTypeEax.Bits.CoreType; > > } > > > > diff --git a/MdePkg/Include/Register/Intel/Cpuid.h > b/MdePkg/Include/Register/Intel/Cpuid.h > index dd1b64a1e50b..a670ab436c37 100644 > --- a/MdePkg/Include/Register/Intel/Cpuid.h > +++ b/MdePkg/Include/Register/Intel/Cpuid.h > @@ -3601,7 +3601,7 @@ typedef union { > CPUID Hybrid Information Enumeration Leaf > > > > @param EAX CPUID_HYBRID_INFORMATION (0x1A) > > - @param ECX CPUID_HYBRID_INFORMATION_SUB_LEAF (0x00). > > + @param ECX CPUID_HYBRID_INFORMATION_MAIN_LEAF (0x00). > > > > @retval EAX Enumerates the native model ID and core type described > > by the type CPUID_NATIVE_MODEL_ID_AND_CORE_TYPE_EAX > > @@ -3615,7 +3615,7 @@ typedef union { > > > AsmCpuidEx ( > > CPUID_HYBRID_INFORMATION, > > - CPUID_HYBRID_INFORMATION_SUB_LEAF, > > + CPUID_HYBRID_INFORMATION_MAIN_LEAF, > > &Eax, NULL, NULL, NULL > > ); > > @endcode > > @@ -3626,11 +3626,11 @@ typedef union { > /// > > /// CPUID Hybrid Information Enumeration sub-leaf > > /// > > -#define CPUID_HYBRID_INFORMATION_SUB_LEAF 0x00 > > +#define CPUID_HYBRID_INFORMATION_MAIN_LEAF 0x00 > > > > /** > > CPUID Hybrid Information EAX for CPUID leaf > #CPUID_HYBRID_INFORMATION, > > - sub-leaf #CPUID_HYBRID_INFORMATION_SUB_LEAF. > > + sub-leaf #CPUID_HYBRID_INFORMATION_MAIN_LEAF. > > **/ > > typedef union { > > /// > > @@ -3657,6 +3657,15 @@ typedef union { > UINT32 Uint32; > > } CPUID_NATIVE_MODEL_ID_AND_CORE_TYPE_EAX; > > > > +/// > > +/// @{ Define value for > CPUID_NATIVE_MODEL_ID_AND_CORE_TYPE_EAX.CoreType > > +/// > > +#define CPUID_CORE_TYPE_INTEL_ATOM 0x20 > > +#define CPUID_CORE_TYPE_INTEL_CORE 0x40 > > +/// > > +/// @} > > +/// > > + > > > > /** > > CPUID V2 Extended Topology Enumeration Leaf > > -- > 2.28.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70664): https://edk2.groups.io/g/devel/message/70664 Mute This Topic: https://groups.io/mt/79998848/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
