diff options
| author | Ray Ni <ray.ni@intel.com> | 2019-04-04 13:34:21 +0800 |
|---|---|---|
| committer | Ray Ni <ray.ni@intel.com> | 2019-04-04 15:36:00 +0800 |
| commit | 516e33972f0a55045dc1ca44ae682bbc9b921580 (patch) | |
| tree | aad32f4442758aa7630ba5a19f9cdd50427276c7 /UefiCpuPkg/Application | |
| parent | f664032e063bda6f477fd0f8a8cccf1371710b9e (diff) | |
| download | edk2-516e33972f0a55045dc1ca44ae682bbc9b921580.tar.gz edk2-516e33972f0a55045dc1ca44ae682bbc9b921580.tar.bz2 edk2-516e33972f0a55045dc1ca44ae682bbc9b921580.zip | |
UefiCpuPkg/Cpuid.h: Remove duplicated struct definition for leaf 1FH
Per SDM CPUID.0BH and CPUID.1FH outputs the same format of data in
EAX/EBX/ECX/EDX except CPUID.1FH reports more level types such as
module, tile, die.
The patch removes the unnecessary duplicated structure definitions
for CPUID.1FH because when the structure definitions for CPUID.0BH
can be used for CPUID.1FH.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Zhiqiang Qin <zhiqiang.qin@intel.com>
Diffstat (limited to 'UefiCpuPkg/Application')
| -rw-r--r-- | UefiCpuPkg/Application/Cpuid/Cpuid.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c index 67cacf2714..d229ac8e7b 100644 --- a/UefiCpuPkg/Application/Cpuid/Cpuid.c +++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c @@ -1,7 +1,7 @@ /** @file
UEFI Application to display CPUID leaf information.
- Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -1394,26 +1394,26 @@ CpuidV2ExtendedTopologyEnumeration ( VOID
)
{
- CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_EAX Eax;
- CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_EBX Ebx;
- CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_ECX Ecx;
- UINT32 Edx;
+ CPUID_EXTENDED_TOPOLOGY_EAX Eax;
+ CPUID_EXTENDED_TOPOLOGY_EBX Ebx;
+ CPUID_EXTENDED_TOPOLOGY_ECX Ecx;
+ UINT32 Edx;
- if (CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION > gMaximumBasicFunction) {
+ if (CPUID_V2_EXTENDED_TOPOLOGY > gMaximumBasicFunction) {
return;
}
AsmCpuidEx (
- CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION,
- CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_MAIN_LEAF,
+ CPUID_V2_EXTENDED_TOPOLOGY,
+ 0,
&Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx
);
- Print (L"CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION (Leaf %08x, Sub-Leaf %08x)\n", CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION, CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_MAIN_LEAF);
+ Print (L"CPUID_V2_EXTENDED_TOPOLOGY (Leaf %08x, Sub-Leaf %08x)\n", CPUID_V2_EXTENDED_TOPOLOGY, 0);
Print (L" EAX:%08x EBX:%08x ECX:%08x EDX:%08x\n", Eax.Uint32, Ebx.Uint32, Ecx.Uint32, Edx);
- PRINT_BIT_FIELD (Eax, BitsNum);
- PRINT_BIT_FIELD (Ebx, ProcessorsNum);
- PRINT_BIT_FIELD (Ecx, LevelNum);
+ PRINT_BIT_FIELD (Eax, ApicIdShift);
+ PRINT_BIT_FIELD (Ebx, LogicalProcessors);
+ PRINT_BIT_FIELD (Ecx, LevelNumber);
PRINT_BIT_FIELD (Ecx, LevelType);
PRINT_VALUE (Edx, x2APICID);
}
|