Reviewed-by: Eric Dong <eric.d...@intel.com> > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Ni, > Ray > Sent: Thursday, April 4, 2019 2:03 PM > To: devel@edk2.groups.io > Cc: Dong, Eric <eric.d...@intel.com>; Zeng, Star <star.z...@intel.com>; Qin, > Zhiqiang <zhiqiang....@intel.com> > Subject: [edk2-devel] [PATCH v2 2/2] UefiCpuPkg/Cpuid: Dump leaf 1FH > information correctly > > Leaf 1FH is very similar to leaf 0BH. Both return the CPU topology > information. > Leaf 0BH returns 3-level (Package/Core/Thread) CPU topology info. > Leaf 1FH returns 6-level (Package/Die/Tile/Module/Core/Thread) CPU > topology info. > The logic to enumerate the topology info is the same. > > But today's logic to handle 1FH is completely wrong. > The patch combines them together to fix the 1FH issue. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ray Ni <ray...@intel.com> > Cc: Eric Dong <eric.d...@intel.com> > Cc: Star Zeng <star.z...@intel.com> > Cc: Zhiqiang Qin <zhiqiang....@intel.com> > --- > UefiCpuPkg/Application/Cpuid/Cpuid.c | 72 +++++++++------------------- > 1 file changed, 23 insertions(+), 49 deletions(-) > > diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c > b/UefiCpuPkg/Application/Cpuid/Cpuid.c > index d229ac8e7b..30d43e9631 100644 > --- a/UefiCpuPkg/Application/Cpuid/Cpuid.c > +++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c > @@ -717,7 +717,7 @@ CpuidArchitecturalPerformanceMonitoring ( **/ > VOID CpuidExtendedTopology ( > - VOID > + UINT32 LeafFunction > ) > { > CPUID_EXTENDED_TOPOLOGY_EAX Eax; > @@ -726,27 +726,34 @@ CpuidExtendedTopology ( > UINT32 Edx; > UINT32 LevelNumber; > > - if (CPUID_EXTENDED_TOPOLOGY > gMaximumBasicFunction) { > + if (LeafFunction > gMaximumBasicFunction) { > + return; > + } > + if ((LeafFunction != CPUID_EXTENDED_TOPOLOGY) && (LeafFunction != > + CPUID_V2_EXTENDED_TOPOLOGY)) { > return; > } > > LevelNumber = 0; > - do { > + for (LevelNumber = 0; ; LevelNumber++) { > AsmCpuidEx ( > - CPUID_EXTENDED_TOPOLOGY, LevelNumber, > + LeafFunction, LevelNumber, > &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx > ); > - if (Eax.Bits.ApicIdShift != 0) { > - Print (L"CPUID_EXTENDED_TOPOLOGY (Leaf %08x, Sub-Leaf %08x)\n", > CPUID_EXTENDED_TOPOLOGY, LevelNumber); > - Print (L" EAX:%08x EBX:%08x ECX:%08x EDX:%08x\n", Eax.Uint32, > Ebx.Uint32, Ecx.Uint32, Edx); > - PRINT_BIT_FIELD (Eax, ApicIdShift); > - PRINT_BIT_FIELD (Ebx, LogicalProcessors); > - PRINT_BIT_FIELD (Ecx, LevelNumber); > - PRINT_BIT_FIELD (Ecx, LevelType); > - PRINT_VALUE (Edx, x2APIC_ID); > + if (Ecx.Bits.LevelType == > CPUID_EXTENDED_TOPOLOGY_LEVEL_TYPE_INVALID) { > + break; > } > - LevelNumber++; > - } while (Eax.Bits.ApicIdShift != 0); > + Print ( > + L"%a (Leaf %08x, Sub-Leaf %08x)\n", > + LeafFunction == CPUID_EXTENDED_TOPOLOGY ? > "CPUID_EXTENDED_TOPOLOGY" : "CPUID_V2_EXTENDED_TOPOLOGY", > + LeafFunction, LevelNumber > + ); > + Print (L" EAX:%08x EBX:%08x ECX:%08x EDX:%08x\n", Eax.Uint32, > Ebx.Uint32, Ecx.Uint32, Edx); > + PRINT_BIT_FIELD (Eax, ApicIdShift); > + PRINT_BIT_FIELD (Ebx, LogicalProcessors); > + PRINT_BIT_FIELD (Ecx, LevelNumber); > + PRINT_BIT_FIELD (Ecx, LevelType); > + PRINT_VALUE (Edx, x2APIC_ID); > + } > } > > /** > @@ -1385,39 +1392,6 @@ CpuidDeterministicAddressTranslationParameters > ( > PRINT_BIT_FIELD (Edx, MaximumNum); > } > > -/** > - Display CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION main leaf and > sub-leafs. > - > -**/ > -VOID > -CpuidV2ExtendedTopologyEnumeration ( > - VOID > - ) > -{ > - CPUID_EXTENDED_TOPOLOGY_EAX Eax; > - CPUID_EXTENDED_TOPOLOGY_EBX Ebx; > - CPUID_EXTENDED_TOPOLOGY_ECX Ecx; > - UINT32 Edx; > - > - if (CPUID_V2_EXTENDED_TOPOLOGY > gMaximumBasicFunction) { > - return; > - } > - > - AsmCpuidEx ( > - CPUID_V2_EXTENDED_TOPOLOGY, > - 0, > - &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx > - ); > - 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, ApicIdShift); > - PRINT_BIT_FIELD (Ebx, LogicalProcessors); > - PRINT_BIT_FIELD (Ecx, LevelNumber); > - PRINT_BIT_FIELD (Ecx, LevelType); > - PRINT_VALUE (Edx, x2APICID); > -} > - > /** > Display CPUID_EXTENDED_FUNCTION leaf. > > @@ -1619,7 +1593,7 @@ UefiMain ( > CpuidStructuredExtendedFeatureFlags (); > CpuidDirectCacheAccessInfo(); > CpuidArchitecturalPerformanceMonitoring (); > - CpuidExtendedTopology (); > + CpuidExtendedTopology (CPUID_EXTENDED_TOPOLOGY); > CpuidExtendedStateMainLeaf (); > CpuidIntelRdtMonitoringEnumerationSubLeaf (); > CpuidIntelRdtMonitoringL3CacheCapabilitySubLeaf (); @@ -1630,7 +1604,7 > @@ UefiMain ( > CpuidProcessorFrequency (); > CpuidSocVendor (); > CpuidDeterministicAddressTranslationParameters (); > - CpuidV2ExtendedTopologyEnumeration (); > + CpuidExtendedTopology (CPUID_V2_EXTENDED_TOPOLOGY); > CpuidExtendedFunction (); > CpuidExtendedCpuSig (); > CpuidProcessorBrandString (); > -- > 2.21.0.windows.1 > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40): https://edk2.groups.io/g/devel/message/40 Mute This Topic: https://groups.io/mt/30893914/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
