From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: ray.ni@intel.com) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Wed, 19 Jun 2019 01:58:11 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jun 2019 01:58:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,392,1557212400"; d="scan'208";a="162151946" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga003.jf.intel.com with ESMTP; 19 Jun 2019 01:58:10 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 19 Jun 2019 01:58:10 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.185]) by shsmsx102.ccr.corp.intel.com ([169.254.2.33]) with mapi id 14.03.0439.000; Wed, 19 Jun 2019 16:58:08 +0800 From: "Ni, Ray" To: "devel@edk2.groups.io" , "Ni, Ray" CC: "Dong, Eric" Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg/MpService: GetProcessorInfo returns 6-level topology Thread-Topic: [edk2-devel] [PATCH] UefiCpuPkg/MpService: GetProcessorInfo returns 6-level topology Thread-Index: AQHVJnz7C9zAeXigpkiko7Lk93VlK6airO+Q Date: Wed, 19 Jun 2019 08:58:08 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C1DACD2@SHSMSX104.ccr.corp.intel.com> References: <15A98DC5A007A952.7301@groups.io> In-Reply-To: <15A98DC5A007A952.7301@groups.io> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This change will be pushed to edk2-staging repo after it gets Reviewed-by. The reason is the change requires a protocol interface change in PI spec. > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Ni, Ray > Sent: Wednesday, June 19, 2019 4:57 PM > To: devel@edk2.groups.io > Cc: Dong, Eric > Subject: [edk2-devel] [PATCH] UefiCpuPkg/MpService: GetProcessorInfo > returns 6-level topology >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ray Ni > Cc: Eric Dong > --- > MdePkg/Include/Protocol/MpService.h | 50 > +++++++++++++++++++++++++--- UefiCpuPkg/Library/MpInitLib/MpLib.c | > 19 +++++++++++ > 2 files changed, 64 insertions(+), 5 deletions(-) >=20 > diff --git a/MdePkg/Include/Protocol/MpService.h > b/MdePkg/Include/Protocol/MpService.h > index 10e2405daf..aeab8b0790 100644 > --- a/MdePkg/Include/Protocol/MpService.h > +++ b/MdePkg/Include/Protocol/MpService.h > @@ -27,7 +27,7 @@ > APs to help test system memory in parallel with other device initiali= zation. > Diagnostics applications may also use this protocol for multi-process= or. >=20 > -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @par Revision Reference: > @@ -79,7 +79,7 @@ typedef struct _EFI_MP_SERVICES_PROTOCOL > EFI_MP_SERVICES_PROTOCOL; #define PROCESSOR_HEALTH_STATUS_BIT > 0x00000004 >=20 > /// > -/// Structure that describes the pyhiscal location of a logical CPU. > +/// Structure that describes the physical location of a logical CPU. > /// > typedef struct { > /// > @@ -96,6 +96,45 @@ typedef struct { > UINT32 Thread; > } EFI_CPU_PHYSICAL_LOCATION; >=20 > +#define CPU_V2_EXTENDED_TOPOLOGY BIT24 > + > +/// > +/// Structure that describes the v2 physical location of a logical CPU. > +/// > +typedef struct { > + /// > + /// Zero-based physical package number that identifies the cartridge = of the > processor. > + /// > + UINT32 Package; > + /// > + /// Zero-based physical module number within package of the processor= . > + /// > + UINT32 Module; > + /// > + /// Zero-based physical tile number within module of the processor. > + /// > + UINT32 Tile; > + /// > + /// Zero-based physical die number within tile of the processor. > + /// > + UINT32 Die; > + /// > + /// Zero-based physical core number within die of the processor. > + /// > + UINT32 Core; > + /// > + /// Zero-based logical thread number within core of the processor. > + /// > + UINT32 Thread; > +} EFI_CPU_PHYSICAL_LOCATION2; > + > +/// > +/// Structure that describes extended processor information. > +/// > +typedef union { > + EFI_CPU_PHYSICAL_LOCATION2 Location2; } > +EXTENDED_PROCESSOR_INFORMATION; > + > /// > /// Structure that describes information about a logical CPU. > /// > @@ -106,7 +145,7 @@ typedef struct { > /// are used, and higher bits are reserved. For IPF, the lower 16 bi= ts > contains > /// id/eid, and higher bits are reserved. > /// > - UINT64 ProcessorId; > + UINT64 ProcessorId; > /// > /// Flags indicating if the processor is BSP or AP, if the processor = is enabled > /// or disabled, and if the processor is healthy. Bits 3..31 are rese= rved and > @@ -125,13 +164,14 @@ typedef struct { > /// 1 1 1 Healthy Enabled BSP. > /// > /// > - UINT32 StatusFlag; > + UINT32 StatusFlag; > /// > /// The physical location of the processor, including the physical pa= ckage > number > /// that identifies the cartridge, the physical core number within pa= ckage, > and > /// logical thread number within core. > /// > - EFI_CPU_PHYSICAL_LOCATION Location; > + EFI_CPU_PHYSICAL_LOCATION Location; > + EXTENDED_PROCESSOR_INFORMATION ExtendedInformation; > } EFI_PROCESSOR_INFORMATION; >=20 > /** > diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c > b/UefiCpuPkg/Library/MpInitLib/MpLib.c > index 6f51bc4ebf..538d6536e2 100644 > --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c > @@ -1774,10 +1774,17 @@ MpInitLibGetProcessorInfo ( > CPU_MP_DATA *CpuMpData; > UINTN CallerNumber; > CPU_INFO_IN_HOB *CpuInfoInHob; > + UINTN OriginalProcessorNumber; >=20 > CpuMpData =3D GetCpuMpData (); > CpuInfoInHob =3D (CPU_INFO_IN_HOB *) (UINTN) CpuMpData- > >CpuInfoInHob; >=20 > + // > + // Lower 24 bits contains the actual processor number. > + // > + OriginalProcessorNumber =3D ProcessorNumber; ProcessorNumber &=3D > BIT24 > + - 1; > + > // > // Check whether caller processor is BSP > // > @@ -1818,6 +1825,18 @@ MpInitLibGetProcessorInfo ( > &ProcessorInfoBuffer->Location.Thread > ); >=20 > + if ((OriginalProcessorNumber & CPU_V2_EXTENDED_TOPOLOGY) !=3D 0) { > + GetProcessorLocation2ByApicId ( > + CpuInfoInHob[ProcessorNumber].ApicId, > + &ProcessorInfoBuffer->ExtendedInformation.Location2.Package, > + &ProcessorInfoBuffer->ExtendedInformation.Location2.Die, > + &ProcessorInfoBuffer->ExtendedInformation.Location2.Tile, > + &ProcessorInfoBuffer->ExtendedInformation.Location2.Module, > + &ProcessorInfoBuffer->ExtendedInformation.Location2.Core, > + &ProcessorInfoBuffer->ExtendedInformation.Location2.Thread > + ); > + } > + > if (HealthData !=3D NULL) { > HealthData->Uint32 =3D CpuInfoInHob[ProcessorNumber].Health; > } > -- > 2.21.0.windows.1 >=20 >=20 >=20