From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A40B3211F2693 for ; Tue, 2 Apr 2019 23:39:57 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Apr 2019 23:39:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,303,1549958400"; d="scan'208";a="334530201" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga005.fm.intel.com with ESMTP; 02 Apr 2019 23:39:56 -0700 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 2 Apr 2019 23:39:56 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 2 Apr 2019 23:39:55 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.206]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.93]) with mapi id 14.03.0415.000; Wed, 3 Apr 2019 14:39:54 +0800 From: "Dong, Eric" To: "Ni, Ray" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH] UefiCpuPkg/Cpuid: Dump leaf 1FH information correctly Thread-Index: AQHU5grfaMKJ6G5OKUiyJQJX5D8nmaYqA0jg Date: Wed, 3 Apr 2019 06:39:52 +0000 Message-ID: References: <20190329084159.69164-1-ray.ni@intel.com> In-Reply-To: <20190329084159.69164-1-ray.ni@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] UefiCpuPkg/Cpuid: Dump leaf 1FH information correctly X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2019 06:39:57 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Ray, > -----Original Message----- > From: Ni, Ray > Sent: Friday, March 29, 2019 4:42 PM > To: edk2-devel@lists.01.org > Cc: Dong, Eric > Subject: [PATCH] UefiCpuPkg/Cpuid: Dump leaf 1FH information correctly >=20 > Leaf 1FH is very similar to leaf 0BH. Both return the CPU topology inform= ation. > 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. >=20 > But today's logic to handle 1FH is completely wrong. > The patch combines them together to fix the 1FH issue. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ray Ni > Cc: Eric Dong > --- > UefiCpuPkg/Application/Cpuid/Cpuid.c | 83 ++++++++++------------------ > 1 file changed, 28 insertions(+), 55 deletions(-) >=20 > diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c > b/UefiCpuPkg/Application/Cpuid/Cpuid.c > index 67cacf2714..3d242a0cbf 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. >=20 > - Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
> + Copyright (c) 2016 - 2019, Intel Corporation. All rights > + reserved.
> 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 @@ -717,36 +717,42 @@ > CpuidArchitecturalPerformanceMonitoring ( **/ VOID > CpuidExtendedTopology ( > - VOID > + UINT32 LeafFunction > ) > { > - CPUID_EXTENDED_TOPOLOGY_EAX Eax; > - CPUID_EXTENDED_TOPOLOGY_EBX Ebx; > - CPUID_EXTENDED_TOPOLOGY_ECX Ecx; > - UINT32 Edx; > - UINT32 LevelNumber; > + CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_EAX Eax; > + CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_EBX Ebx; > + CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_ECX Ecx; > + UINT32 Edx; > + UINT32 LevelNumber; >=20 > - if (CPUID_EXTENDED_TOPOLOGY > gMaximumBasicFunction) { > + if (LeafFunction > gMaximumBasicFunction) { > + return; > + } > + if ((LeafFunction !=3D CPUID_EXTENDED_TOPOLOGY) && (LeafFunction !=3D > + CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION)) { > return; > } >=20 > LevelNumber =3D 0; > - do { > + for (LevelNumber =3D 0; ; LevelNumber++) { > AsmCpuidEx ( > - CPUID_EXTENDED_TOPOLOGY, LevelNumber, > + LeafFunction, LevelNumber, > &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx > ); > - if (Eax.Bits.ApicIdShift !=3D 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 =3D=3D > CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_LEVEL_TYPE_INVALID) { > + break; > } > - LevelNumber++; > - } while (Eax.Bits.ApicIdShift !=3D 0); > + Print ( > + L"%a (Leaf %08x, Sub-Leaf %08x)\n", > + LeafFunction =3D=3D CPUID_EXTENDED_TOPOLOGY ? > "CPUID_EXTENDED_TOPOLOGY" : > "CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION-2", > + LeafFunction, LevelNumber); > + 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 (Ecx, LevelType); > + PRINT_VALUE (Edx, x2APIC_ID); The name for above fields are different in CPUID_EXTENDED_TOPOLOGY and CPUI= D_V2_EXTENDED_TOPOLOGY_ENUMERATION, So I think above print are not correct for CPUID_EXTENDED_TOPOLOGY, right? Thanks, Eric > + } > } >=20 > /** > @@ -1385,39 +1391,6 @@ CpuidDeterministicAddressTranslationParameters > ( > PRINT_BIT_FIELD (Edx, MaximumNum); > } >=20 > -/** > - Display CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION main leaf and > sub-leafs. > - > -**/ > -VOID > -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; > - > - if (CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION > > gMaximumBasicFunction) { > - return; > - } > - > - AsmCpuidEx ( > - CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION, > - CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION_MAIN_LEAF, > - &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" 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 (Ecx, LevelType); > - PRINT_VALUE (Edx, x2APICID); > -} > - > /** > Display CPUID_EXTENDED_FUNCTION leaf. >=20 > @@ -1619,7 +1592,7 @@ UefiMain ( > CpuidStructuredExtendedFeatureFlags (); > CpuidDirectCacheAccessInfo(); > CpuidArchitecturalPerformanceMonitoring (); > - CpuidExtendedTopology (); > + CpuidExtendedTopology (CPUID_EXTENDED_TOPOLOGY); > CpuidExtendedStateMainLeaf (); > CpuidIntelRdtMonitoringEnumerationSubLeaf (); > CpuidIntelRdtMonitoringL3CacheCapabilitySubLeaf (); @@ -1630,7 +1603,7 > @@ UefiMain ( > CpuidProcessorFrequency (); > CpuidSocVendor (); > CpuidDeterministicAddressTranslationParameters (); > - CpuidV2ExtendedTopologyEnumeration (); > + CpuidExtendedTopology > (CPUID_V2_EXTENDED_TOPOLOGY_ENUMERATION); > CpuidExtendedFunction (); > CpuidExtendedCpuSig (); > CpuidProcessorBrandString (); > -- > 2.21.0.windows.1