From: "Jason Lou" <yun.lou@intel.com>
To: devel@edk2.groups.io
Cc: Jason <yun.lou@intel.com>,
Michael D Kinney <michael.d.kinney@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Zhiguang Liu <zhiguang.liu@intel.com>, Ray Ni <ray.ni@intel.com>,
Eric Dong <eric.dong@intel.com>, Laszlo Ersek <lersek@redhat.com>,
Rahul Kumar <rahul1.kumar@intel.com>
Subject: [PATCH v2 1/1] MdePkg/Cpuid.h: Change and add some macro definitions.
Date: Thu, 21 Jan 2021 15:28:30 +0800 [thread overview]
Message-ID: <20210121072830.4083-1-yun.lou@intel.com> (raw)
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>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: 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>
---
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
next reply other threads:[~2021-01-21 7:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 7:28 Jason Lou [this message]
2021-01-22 4:21 ` [PATCH v2 1/1] MdePkg/Cpuid.h: Change and add some macro definitions Ni, Ray
2021-01-22 4:57 ` 回复: [edk2-devel] " gaoliming
2021-01-22 5:46 ` [edk2-devel] " Jason Lou
2021-01-22 8:07 ` 回复: " gaoliming
2021-01-25 1:30 ` [edk2-devel] " Jason Lou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210121072830.4083-1-yun.lou@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox