From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 5398EAC08FB for ; Tue, 21 Nov 2023 02:23:26 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=rP4eCgEUv5pOUhrkAZmkl19mSwkKkEjChwq2AzwaM9Y=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1700533404; v=1; b=PlZBQE/Wd+BdPO8z5H1xARZwI7JQCY6Cf+aOvnKd1WmA5HTzMdBMYPs1159j76ojIErnIrUd aTXWUVvnkwH2kJ6Ntb3eC25WIUr5ZLjffEtY1huT0Nhk+8gkG8F+MLs84gwUacqW7R8+z7D5ORM oQpS1vYVqVMgERb+9SL9nP24= X-Received: by 127.0.0.2 with SMTP id BOUfYY7687511xZQFO3Gqr89; Mon, 20 Nov 2023 18:23:24 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by mx.groups.io with SMTP id smtpd.web10.25978.1700533404411751812 for ; Mon, 20 Nov 2023 18:23:24 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="13296209" X-IronPort-AV: E=Sophos;i="6.04,215,1695711600"; d="scan'208";a="13296209" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 18:23:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="801381941" X-IronPort-AV: E=Sophos;i="6.04,215,1695711600"; d="scan'208";a="801381941" X-Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga001.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 20 Nov 2023 18:23:15 -0800 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Mon, 20 Nov 2023 18:23:14 -0800 X-Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Mon, 20 Nov 2023 18:23:14 -0800 X-Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Mon, 20 Nov 2023 18:23:14 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Mon, 20 Nov 2023 18:23:14 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UMRFXZNIvr8CGyJQBPMwGvoO1od2Oi5Ga00K69V/mr+6dxiFEp6wBf0t7mwivI+hq24josc07+6R44+qNMMriykwmru6yzV2+SjgNtH6NfS+HrNR/JZcPf0OiHK7cYUi0fPFMHhm4RjNvUTROZ7i7s1Rm9wDC5aG0JUgackKoarbLjUZbSV9gCre4+veZnMBGz//XVJ6D3k6ygTQMxR3zd8fXLIcoC6MzJUJo4LSvcfwpfptWPhxcEDDaLU/rWN8pBl5eHFINKNFBxl9VKPLYcb+WMGsaRRdSWmUoZte0pDuvRg4ite15QyPNEQljTlJJKa+lfunrEJc82yYcAEmBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aNrwh2LQXHkO5YfMTyhfryySEDF1SV/UFORNFIFkAb8=; b=mJgl5elE771Ule3UaRinPHPr2P0p9Rdq/0r96RUO0n6ADrhJeumLMYPDcmHlovMgfkMVGZbfGvTX/eUaeGVIj3eYbHysfJI1c6qJ71HWCf2DZDtS8R5g039kxvBqbnCJcUv8itUuLn3DhKGVPhEUxux0dqcKtReGTAElkgr7euT+96Iee5IXn31Gqq+KuzfnlcuulRyvqRlkOgqIlj3l2bH99XMw+UDGMjGF6D9gKTph15YDqILt6bfXIMBcgGccCKRcZ5cgINaGq8v6gmpuGKVLQTcCIud/YA5gtLw5WQ/yto+AoZdVd3jS5UBzbKlVGFlwstBga3NBAP71aoU7Yw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by CY5PR11MB6391.namprd11.prod.outlook.com (2603:10b6:930:38::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.27; Tue, 21 Nov 2023 02:23:12 +0000 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::b614:1f5e:8b0c:9858]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::b614:1f5e:8b0c:9858%4]) with mapi id 15.20.7002.028; Tue, 21 Nov 2023 02:23:11 +0000 From: "Ni, Ray" To: "Wu, Jiaxin" , "devel@edk2.groups.io" CC: Laszlo Ersek , "Dong, Eric" , "Kumar, Rahul R" , Gerd Hoffmann , "Zeng, Star" Subject: Re: [edk2-devel] [PATCH v2 1/3] UefiCpuPkg/BaseXApicLib: Fix CPUID_V2_EXTENDED_TOPOLOGY detection Thread-Topic: [PATCH v2 1/3] UefiCpuPkg/BaseXApicLib: Fix CPUID_V2_EXTENDED_TOPOLOGY detection Thread-Index: AQHaF7Ufm8qmyahyOU60Vtiurp/lbrCEE7AQ Date: Tue, 21 Nov 2023 02:23:11 +0000 Message-ID: References: <20231115111553.6592-1-jiaxin.wu@intel.com> <20231115111553.6592-2-jiaxin.wu@intel.com> In-Reply-To: <20231115111553.6592-2-jiaxin.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|CY5PR11MB6391:EE_ x-ms-office365-filtering-correlation-id: 96c28233-b13f-4089-efbb-08dbea38cee4 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: 0UWhFmq8ZngaO4VJ5WodLGbDZlHf+UCSxQ6IsNLWBlN/n+0jim1kpigkK7E+/jBNP354/sgVkm6VYvny9mJeCe+4CwkJuxtY2JgYEsTYdTpd3CHVwsAoKKGAXtYLah7fMH3Ws6IpByJhpuaoZ0yIb70box/gryIT/TmXcXhJgZFJ2K2YFwIXxt0yuC41Gsh9YBhYerUe2DdBhNqGUW+H0vScoR8FjVQTP64l0eyLDnDuXm6pYlKJ6YYc1oWfiZEN0DZ4I6rSjnEIe11tw9+AlOffKNdPSCPv+KEm83W7oPUymAUod0xDTRC0uvhmu6l91HLWuu5vLYQ2g0umE4J1eUsk1dD82GY20TyLIae6RIBn0WWmjKUIPNXTX3g/skrqTK50iDygUG7sGoNlCyCqB6dfgnbtOn6XQU2H2NWu00dmrjClG+2yMO0DU0pQvTRLPuVlLAN/pZz+HxBhpC9zymbPV5H5b2sXxJAlLv+4k3v3iUJPHo7PllV6H3RZc5fT5qODp54MLX0XjceGFv40dt6OHATsiu1qLAS9u1970+xdDSIqiX9cXd59jWeesmvbMmi/puhQ/Vous8iMXCjzntu527JyYwh4UAZKNVtMwWDkfn7q8X9ODwfTPkuM2wpF x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?IKTGyF2PjJL3hIkqqfGXYHj+3kfrx9qbxarUUjic+Ok5wncquVHDU5/KTBnV?= =?us-ascii?Q?+4R3z6FYn8JNCTgYaZS729GWS718VcvKWojc9syvofAOY2qUlDp3bbUfmW6X?= =?us-ascii?Q?H2Li4Nk4MvfLiFcceRjOqJMa2cq8NQe9im14bh/KVJ867hjf8W7P5kKt60Gh?= =?us-ascii?Q?eHJXQCUtYOhQsq2rgyRIyyCAOP/hCFhEQksOjWn2XrTEKRuxn21iyLmcrb/V?= =?us-ascii?Q?CtiM4Es/snYM6RAISgy0ExwKXnOeIkDjROfA4JwdpnNExdlWtUIec5e/o/KH?= =?us-ascii?Q?algqPsUfJRMyAUQ5WrSjhUgZw6NfkoiS3IQaeiiu98Zgq7sT9iPekR0BBXb3?= =?us-ascii?Q?B1x0uOHClwbQX6oXqMUlZ2B0AO1GTLvMpT5XUPg5TDrsSTv77sB2FXv/zve5?= =?us-ascii?Q?KAuxggaZOKg8yDTiGyED+U6fdckswNsREir3Xvgi/fcgkIbl9Bdjoz6aUXjn?= =?us-ascii?Q?u3LN9xW52jsjvDQ5CGbBz1e+dsu50ZK7BSivBivl6aclEr1SqepB0h37Jwl8?= =?us-ascii?Q?X99CWoT0wPOV1AVjEmTyJe5CChiLXgutiWEpiGUj8EktxQjcn+jEHS/mlus8?= =?us-ascii?Q?D0CZc1kNWU2qFhDVqn+xyDWToxcXMH29Dt7EqkEg1Ececp0xWy/wFhapScSo?= =?us-ascii?Q?Cz/FISc/ZmcZkoiHGdxfDrBwl1FaFEUW7+G+8/g4UBlaWjdThVyYqsU+I12C?= =?us-ascii?Q?DRwbRt2kYcrxrq4tQ4MaGmGk5U7717LZjBqEKeGDCbeV0SYTKks0AkX7R+g+?= =?us-ascii?Q?BUCNXnnlm7XtdixsfcSbWEb0mV/TpV4cf3QrmgNDAQVdu8oeEq1c/XZ1t9ED?= =?us-ascii?Q?tGbxT3VO/OXcGKjsrezCAt28WNDATnUk9tpYnu0Svc7L8Aiotnoj+FVWmAPd?= =?us-ascii?Q?tQZ99nEA4thvSiafV2EkuKL56ANJcs7olcdszRo1sQJ1f/ozt0VRa6feIU7W?= =?us-ascii?Q?8cd76yO7QE7G1HfBt6BNqSbxrWoaG6i7jcLlCa/aAPCvDAx/Rmw+Pf8EP9rx?= =?us-ascii?Q?SO2r64Y75Lwmj/j9OfTP7z1m6jklss+99CKvxJ8JGnZ3GhaKvZhr/+G3zdvN?= =?us-ascii?Q?n7U6S8b79gGXl5ym9i9NgXu7LhlwKSpRYsQihGfJbDykRJgzx31miin399F7?= =?us-ascii?Q?9dRYr3885K/cUOyDAd50Ql/LBl8Se8z5C54t4BRBD1DSC3YIyF0KvrSwQcUd?= =?us-ascii?Q?JqdAvJqkCh0OugbrvXhMcs/rXMUia3oEVZM9RZBw+Z4BLIlwKUJlU2gf6mMX?= =?us-ascii?Q?E+uLwdvHvCg60EF9x44bOPMhEgzFlxdFvwCtHhXHkubcXGwN7fixcjTvkux0?= =?us-ascii?Q?nDwfDPruZ1+1a/49HR2+6LRktVGDiqChE0E4u/cOfUXykZ7Usv35qpbsX1PN?= =?us-ascii?Q?NvdFo6nDVzka2tTBQO7mw8KA7GGQHceQLmlkUwvpQjmQi2UEETm2TXMyxofL?= =?us-ascii?Q?bi2IUM8e7s4PDxK1lFdq/MKLF/Crs2N6slvmHFauGFnBkZa4Avj0hp3XHBNF?= =?us-ascii?Q?WQZGW9H5fJKaO707g5C51FmgzT1G9RSFUKFjyEsACSsTXjftO60tj03ss/Tr?= =?us-ascii?Q?TpPBaaDuztHE1uK/A58=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96c28233-b13f-4089-efbb-08dbea38cee4 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2023 02:23:11.3082 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: LfgATui9K6zOtVJsj/sZrIoFiy1FZY7VeLuWChY/fU75B0jWN8LKTIjHpxlJNEt11aEEojMo435X1nsyXzsOUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6391 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ray.ni@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: YGP6IYLf0BsLK5doBDE8TMsXx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b="PlZBQE/W"; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: Ray Ni Thanks, Ray > -----Original Message----- > From: Wu, Jiaxin > Sent: Wednesday, November 15, 2023 7:16 PM > To: devel@edk2.groups.io > Cc: Laszlo Ersek ; Dong, Eric ; N= i, > Ray ; Kumar, Rahul R ; Gerd > Hoffmann ; Zeng, Star > Subject: [PATCH v2 1/3] UefiCpuPkg/BaseXApicLib: Fix > CPUID_V2_EXTENDED_TOPOLOGY detection >=20 > This patch is to complete 170d4ce8, sync the change to BaseXApicLib. >=20 > Checking the max cpuid leaf is not enough to figure whenever > CPUID_V2_EXTENDED_TOPOLOGY is supported. Intel SDM says: >=20 > Software must detect the presence of CPUID leaf 1FH by verifying > (a) the highest leaf index supported by CPUID is >=3D 1FH, and > (b) CPUID.1FH:EBX[15:0] reports a non-zero value. >=20 > The same is true for CPUID leaf 0BH. >=20 > This patch adds the EBX check to GetProcessorLocation2ByApicId(). The > patch also fixes the existing check in GetProcessorLocationByApicId() to > be in line with the spec by looking at bits 15:0. The comments are > updated with a quote from the Intel SDM. >=20 > Cc: Laszlo Ersek > Cc: Eric Dong > Cc: Ray Ni > Cc: Rahul Kumar > Cc: Gerd Hoffmann > Cc: Star Zeng > Signed-off-by: Gerd Hoffmann > Signed-off-by: Jiaxin Wu > --- > UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 21 > ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) >=20 > diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > index d56c6275cc..efb9d71ca1 100644 > --- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > +++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c > @@ -1053,15 +1053,16 @@ GetProcessorLocationByApicId ( > &ExtendedTopologyEbx.Uint32, > &ExtendedTopologyEcx.Uint32, > NULL > ); > // > - // If CPUID.(EAX=3D0BH, ECX=3D0H):EBX returns zero and maximum input > value for > - // basic CPUID information is greater than 0BH, then CPUID.0BH leaf = is > not > - // supported on that processor. > + // Quoting Intel SDM: > + // Software must detect the presence of CPUID leaf 0BH by > + // verifying (a) the highest leaf index supported by CPUID is >=3D > + // 0BH, and (b) CPUID.0BH:EBX[15:0] reports a non-zero value. > // > - if (ExtendedTopologyEbx.Uint32 !=3D 0) { > + if (ExtendedTopologyEbx.Bits.LogicalProcessors !=3D 0) { > TopologyLeafSupported =3D TRUE; >=20 > // > // Sub-leaf index 0 (ECX=3D 0 as input) provides enumeration > parameters to extract > // the SMT sub-field of x2APIC ID. > @@ -1183,10 +1184,11 @@ GetProcessorLocation2ByApicId ( > OUT UINT32 *Core OPTIONAL, > OUT UINT32 *Thread OPTIONAL > ) > { > CPUID_EXTENDED_TOPOLOGY_EAX ExtendedTopologyEax; > + CPUID_EXTENDED_TOPOLOGY_EBX ExtendedTopologyEbx; > CPUID_EXTENDED_TOPOLOGY_ECX ExtendedTopologyEcx; > UINT32 MaxStandardCpuIdIndex; > UINT32 Index; > UINTN LevelType; > UINT32 > Bits[CPUID_V2_EXTENDED_TOPOLOGY_LEVEL_TYPE_DIE + 2]; > @@ -1195,14 +1197,23 @@ GetProcessorLocation2ByApicId ( > for (LevelType =3D 0; LevelType < ARRAY_SIZE (Bits); LevelType++) { > Bits[LevelType] =3D 0; > } >=20 > // > - // Get max index of CPUID > + // Quoting Intel SDM: > + // Software must detect the presence of CPUID leaf 1FH by verifying > + // (a) the highest leaf index supported by CPUID is >=3D 1FH, and (b) > + // CPUID.1FH:EBX[15:0] reports a non-zero value. > // > AsmCpuid (CPUID_SIGNATURE, &MaxStandardCpuIdIndex, NULL, NULL, > NULL); > if (MaxStandardCpuIdIndex < CPUID_V2_EXTENDED_TOPOLOGY) { > + ExtendedTopologyEbx.Bits.LogicalProcessors =3D 0; > + } else { > + AsmCpuidEx (CPUID_V2_EXTENDED_TOPOLOGY, 0, NULL, > &ExtendedTopologyEbx.Uint32, NULL, NULL); > + } > + > + if (ExtendedTopologyEbx.Bits.LogicalProcessors =3D=3D 0) { > if (Die !=3D NULL) { > *Die =3D 0; > } >=20 > if (Tile !=3D NULL) { > -- > 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111500): https://edk2.groups.io/g/devel/message/111500 Mute This Topic: https://groups.io/mt/102602851/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-