Reviewed-by: Liming Gao <gaolim...@byosoft.com.cn> > -----邮件原件----- > 发件人: bounce+27952+70709+4905953+8761...@groups.io > <bounce+27952+70709+4905953+8761...@groups.io> 代表 Jason Lou > 发送时间: 2021年1月25日 9:21 > 收件人: devel@edk2.groups.io > 抄送: Jason <yun....@intel.com>; Michael D Kinney > <michael.d.kin...@intel.com>; Liming Gao <gaolim...@byosoft.com.cn>; > Zhiguang Liu <zhiguang....@intel.com>; Ray Ni <ray...@intel.com>; Eric Dong > <eric.d...@intel.com>; Laszlo Ersek <ler...@redhat.com>; Rahul Kumar > <rahul1.ku...@intel.com> > 主题: [edk2-devel] [PATCH v3 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 <yun....@intel.com> > Cc: Michael D Kinney <michael.d.kin...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn> > Cc: Zhiguang Liu <zhiguang....@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Eric Dong <eric.d...@intel.com> > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Rahul Kumar <rahul1.ku...@intel.com> > --- > UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c | 2 +- > MdePkg/Include/Register/Intel/Cpuid.h | 19 > ++++++++++++++----- > 2 files changed, 15 insertions(+), 6 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..19af99b6afa7 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 > > @@ -3624,13 +3624,13 @@ typedef union { > #define CPUID_HYBRID_INFORMATION > 0x1A > > > > /// > > -/// CPUID Hybrid Information Enumeration sub-leaf > > +/// CPUID Hybrid Information Enumeration main 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. > > + main 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 (#70709): https://edk2.groups.io/g/devel/message/70709 > Mute This Topic: https://groups.io/mt/80093966/4905953 > Group Owner: devel+ow...@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub > [gaolim...@byosoft.com.cn] > -=-=-=-=-=-= >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70712): https://edk2.groups.io/g/devel/message/70712 Mute This Topic: https://groups.io/mt/80094512/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
