UefiCpuPkg/CpuFeature: Introduce First to indicate 1st unit.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1584

The flow of CPU feature initialization logic is:
1. BSP calls GetConfigDataFunc() for each thread/AP;
2. Each thread/AP calls SupportFunc() to detect its own capability;
3. BSP calls InitializeFunc() for each thread/AP.

There is a design gap in step #3. For a package scope feature that only
requires one thread of each package does the initialization operation,
what InitializeFunc() currently does is to do the initialization
operation only CPU physical location Core# is 0.
But in certain platform, Core#0 might be disabled in hardware level
which results the certain package scope feature isn't initialized at
all.

The patch adds a new field First to indicate the CPU's location in
its parent scope.
First.Package is set for all APs/threads under first package;
First.Core is set for all APs/threads under first core of each
package;
First.Thread is set for the AP/thread of each core.

Signed-off-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

2 files changed, 111 insertions, 1 deletions

diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
index be14a92b35..27bd2f6b48 100644
--- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
+++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
@@ -79,6 +79,37 @@
 /// @}

 

 ///

+/// The bit field to indicate whether the processor is the first in its parent scope.

+///

+typedef struct {

+  //

+  // Set to 1 when current processor is the first thread in the core it resides in.

+  //

+  UINT32 Thread   : 1;

+  //

+  // Set to 1 when current processor is a thread of the first core in the module it resides in.

+  //

+  UINT32 Core     : 1;

+  //

+  // Set to 1 when current processor is a thread of the first module in the tile it resides in.

+  //

+  UINT32 Module   : 1;

+  //

+  // Set to 1 when current processor is a thread of the first tile in the die it resides in.

+  //

+  UINT32 Tile     : 1;

+  //

+  // Set to 1 when current processor is a thread of the first die in the package it resides in.

+  //

+  UINT32 Die      : 1;

+  //

+  // Set to 1 when current processor is a thread of the first package in the system.

+  //

+  UINT32 Package  : 1;

+  UINT32 Reserved : 26;

+} REGISTER_CPU_FEATURE_FIRST_PROCESSOR;

+

+///

 /// CPU Information passed into the SupportFunc and InitializeFunc of the

 /// RegisterCpuFeature() library function.  This structure contains information

 /// that is commonly used during CPU feature detection and initialization.

@@ -88,6 +119,11 @@ typedef struct {
   /// The package that the CPU resides

   ///

   EFI_PROCESSOR_INFORMATION            ProcessorInfo;

+

+  ///

+  /// The bit flag indicating whether the CPU is the first Thread/Core/Module/Tile/Die/Package in its parent scope.

+  ///

+  REGISTER_CPU_FEATURE_FIRST_PROCESSOR First;

   ///

   /// The Display Family of the CPU computed from CPUID leaf CPUID_VERSION_INFO

   ///

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 0a4fcff033..cdee6d92ab 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -1,7 +1,7 @@
 /** @file

   CPU Features Initialize functions.

 

-  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -105,6 +105,9 @@ CpuInitDataInitialize (
   EFI_CPU_PHYSICAL_LOCATION            *Location;

   BOOLEAN                              *CoresVisited;

   UINTN                                Index;

+  UINT32                               PackageIndex;

+  UINT32                               CoreIndex;

+  UINT32                               First;

   ACPI_CPU_DATA                        *AcpiCpuData;

   CPU_STATUS_INFORMATION               *CpuStatus;

   UINT32                               *ValidCoreCountPerPackage;

@@ -234,6 +237,77 @@ CpuInitDataInitialize (
   ASSERT (CpuFeaturesData->CpuFlags.CoreSemaphoreCount != NULL);

   CpuFeaturesData->CpuFlags.PackageSemaphoreCount = AllocateZeroPool (sizeof (UINT32) * CpuStatus->PackageCount * CpuStatus->MaxCoreCount * CpuStatus->MaxThreadCount);

   ASSERT (CpuFeaturesData->CpuFlags.PackageSemaphoreCount != NULL);

+

+  //

+  // Initialize CpuFeaturesData->InitOrder[].CpuInfo.First

+  //

+

+  //

+  // Set First.Package for each thread belonging to the first package.

+  //

+  First = MAX_UINT32;

+  for (ProcessorNumber = 0; ProcessorNumber < NumberOfCpus; ProcessorNumber++) {

+    Location = &CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.ProcessorInfo.Location;

+    First = MIN (Location->Package, First);

+  }

+  for (ProcessorNumber = 0; ProcessorNumber < NumberOfCpus; ProcessorNumber++) {

+    Location = &CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.ProcessorInfo.Location;

+    if (Location->Package == First) {

+      CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.First.Package = 1;

+    }

+  }

+

+  //

+  // Set First.Die/Tile/Module for each thread assuming:

+  //  single Die under each package, single Tile under each Die, single Module under each Tile

+  //

+  for (ProcessorNumber = 0; ProcessorNumber < NumberOfCpus; ProcessorNumber++) {

+    CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.First.Die = 1;

+    CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.First.Tile = 1;

+    CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.First.Module = 1;

+  }

+

+  for (PackageIndex = 0; PackageIndex < CpuStatus->PackageCount; PackageIndex++) {

+    //

+    // Set First.Core for each thread in the first core of each package.

+    //

+    First = MAX_UINT32;

+    for (ProcessorNumber = 0; ProcessorNumber < NumberOfCpus; ProcessorNumber++) {

+      Location = &CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.ProcessorInfo.Location;

+      if (Location->Package == PackageIndex) {

+        First = MIN (Location->Core, First);

+      }

+    }

+

+    for (ProcessorNumber = 0; ProcessorNumber < NumberOfCpus; ProcessorNumber++) {

+      Location = &CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.ProcessorInfo.Location;

+      if (Location->Package == PackageIndex && Location->Core == First) {

+        CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.First.Core = 1;

+      }

+    }

+  }

+

+  for (PackageIndex = 0; PackageIndex < CpuStatus->PackageCount; PackageIndex++) {

+    for (CoreIndex = 0; CoreIndex < CpuStatus->MaxCoreCount; CoreIndex++) {

+      //

+      // Set First.Thread for the first thread of each core.

+      //

+      First = MAX_UINT32;

+      for (ProcessorNumber = 0; ProcessorNumber < NumberOfCpus; ProcessorNumber++) {

+        Location = &CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.ProcessorInfo.Location;

+        if (Location->Package == PackageIndex && Location->Core == CoreIndex) {

+          First = MIN (Location->Thread, First);

+        }

+      }

+

+      for (ProcessorNumber = 0; ProcessorNumber < NumberOfCpus; ProcessorNumber++) {

+        Location = &CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.ProcessorInfo.Location;

+        if (Location->Package == PackageIndex && Location->Core == CoreIndex && Location->Thread == First) {

+          CpuFeaturesData->InitOrder[ProcessorNumber].CpuInfo.First.Thread = 1;

+        }

+      }

+    }

+  }

 }

 

 /**