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.lou@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>

diff --git a/MdePkg/Include/Register/Intel/Cpuid.h b/MdePkg/Include/Register/Intel/Cpuid.h
index dd1b64a1e50b64e4814db60540c8df69a2c04104..19af99b6afa7921daec01600994bee4b216ebe25 100644 (file)
--- 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\r
 \r
   @param   EAX  CPUID_HYBRID_INFORMATION (0x1A)\r
-  @param   ECX  CPUID_HYBRID_INFORMATION_SUB_LEAF (0x00).\r
+  @param   ECX  CPUID_HYBRID_INFORMATION_MAIN_LEAF (0x00).\r
 \r
   @retval  EAX  Enumerates the native model ID and core type described\r
                 by the type CPUID_NATIVE_MODEL_ID_AND_CORE_TYPE_EAX\r
@@ -3615,7 +3615,7 @@ typedef union {
 \r
   AsmCpuidEx (\r
     CPUID_HYBRID_INFORMATION,\r
-    CPUID_HYBRID_INFORMATION_SUB_LEAF,\r
+    CPUID_HYBRID_INFORMATION_MAIN_LEAF,\r
     &Eax, NULL, NULL, NULL\r
     );\r
   @endcode\r
@@ -3624,13 +3624,13 @@ typedef union {
 #define CPUID_HYBRID_INFORMATION                                       0x1A\r
 \r
 ///\r
-/// CPUID Hybrid Information Enumeration sub-leaf\r
+/// CPUID Hybrid Information Enumeration main leaf\r
 ///\r
-#define CPUID_HYBRID_INFORMATION_SUB_LEAF                               0x00\r
+#define CPUID_HYBRID_INFORMATION_MAIN_LEAF                              0x00\r
 \r
 /**\r
   CPUID Hybrid Information EAX for CPUID leaf #CPUID_HYBRID_INFORMATION,\r
-  sub-leaf #CPUID_HYBRID_INFORMATION_SUB_LEAF.\r
+  main leaf #CPUID_HYBRID_INFORMATION_MAIN_LEAF.\r
 **/\r
 typedef union {\r
   ///\r
@@ -3657,6 +3657,15 @@ typedef union {
   UINT32  Uint32;\r
 } CPUID_NATIVE_MODEL_ID_AND_CORE_TYPE_EAX;\r
 \r
+///\r
+/// @{ Define value for CPUID_NATIVE_MODEL_ID_AND_CORE_TYPE_EAX.CoreType\r
+///\r
+#define   CPUID_CORE_TYPE_INTEL_ATOM                                    0x20\r
+#define   CPUID_CORE_TYPE_INTEL_CORE                                    0x40\r
+///\r
+/// @}\r
+///\r
+\r
 \r
 /**\r
   CPUID V2 Extended Topology Enumeration Leaf\r

diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c b/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c
index 6b87be261acf8a5a758807ab0f58c8d910646740..d1f9830c91e74b0b65b996b5e4cb583906a899c9 100644 (file)
--- a/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c
+++ b/UefiCpuPkg/Library/CpuCacheInfoLib/CpuCacheInfoLib.c
@@ -175,7 +175,7 @@ CpuCacheInfoCollectCoreAndCacheData (
   //\r
   Context->ProcessorInfo[ProcessorIndex].CoreType = 0;\r
   if (CpuidMaxInput >= CPUID_HYBRID_INFORMATION) {\r
-    AsmCpuidEx (CPUID_HYBRID_INFORMATION, CPUID_HYBRID_INFORMATION_SUB_LEAF, &NativeModelIdAndCoreTypeEax.Uint32, NULL, NULL, NULL);\r
+    AsmCpuidEx (CPUID_HYBRID_INFORMATION, CPUID_HYBRID_INFORMATION_MAIN_LEAF, &NativeModelIdAndCoreTypeEax.Uint32, NULL, NULL, NULL);\r
     Context->ProcessorInfo[ProcessorIndex].CoreType = (UINT8) NativeModelIdAndCoreTypeEax.Bits.CoreType;\r
   }\r
 \r