From 6a2ee2bb63758c9e171b6c791a21bc1a68aa8429 Mon Sep 17 00:00:00 2001
From: Jeff Fan <jeff.fan@intel.com>
Date: Thu, 21 Jul 2016 00:32:53 +0800
Subject: UefiCpuPkg/MpInitLib: Skip collect processor count if GUIDed HOB
 exist

If GUIDed HOB mCpuInitMpLibHobGuid exists, we could get the processor count and
processor APICID and Initial APICID from CPU_INFO_IN_HOB. We needn't to delay
for broadcast INIT-SIPI-SIPI results and could improve performance.

Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Michael Kinney <michael.d.kinney@intel.com>
---
 UefiCpuPkg/Library/MpInitLib/MpLib.c | 60 +++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index d6eef138ac..7ae65598dc 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -765,6 +765,8 @@ MpInitLibInitialize (
   VOID
   )
 {
+  CPU_MP_DATA              *OldCpuMpData;
+  CPU_INFO_IN_HOB          *CpuInfoInHob;
   UINT32                   MaxLogicalProcessorNumber;
   UINT32                   ApStackSize;
   MP_ASSEMBLY_ADDRESS_MAP  AddressMap;
@@ -778,7 +780,13 @@ MpInitLibInitialize (
   UINTN                    Index;
   UINTN                    ApResetVectorSize;
   UINTN                    BackupBufferAddr;
-  MaxLogicalProcessorNumber = PcdGet32(PcdCpuMaxLogicalProcessorNumber);
+
+  OldCpuMpData = GetCpuMpDataFromGuidedHob ();
+  if (OldCpuMpData == NULL) {
+    MaxLogicalProcessorNumber = PcdGet32(PcdCpuMaxLogicalProcessorNumber);
+  } else {
+    MaxLogicalProcessorNumber = OldCpuMpData->CpuCount;
+  }
 
   AsmGetAddressMap (&AddressMap);
   ApResetVectorSize = AddressMap.RendezvousFunnelSize + sizeof (MP_CPU_EXCHANGE_INFO);
@@ -843,11 +851,52 @@ MpInitLibInitialize (
   //
   MtrrGetAllMtrrs (&CpuMpData->MtrrTable);
 
+  if (OldCpuMpData == NULL) {
+    //
+    // Wakeup all APs and calculate the processor count in system
+    //
+    CollectProcessorCount (CpuMpData);
+  } else {
+    //
+    // APs have been wakeup before, just get the CPU Information
+    // from HOB
+    //
+    CpuMpData->CpuCount  = OldCpuMpData->CpuCount;
+    CpuMpData->BspNumber = OldCpuMpData->BspNumber;
+    CpuMpData->InitFlag  = ApInitReconfig;
+    CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) OldCpuMpData->CpuInfoInHob;
+    for (Index = 0; Index < CpuMpData->CpuCount; Index++) {
+      InitializeSpinLock(&CpuMpData->CpuData[Index].ApLock);
+      CpuMpData->CpuData[Index].ApicId        = CpuInfoInHob[Index].ApicId;
+      CpuMpData->CpuData[Index].InitialApicId = CpuInfoInHob[Index].InitialApicId;
+      if (CpuMpData->CpuData[Index].InitialApicId >= 255) {
+        CpuMpData->X2ApicEnable = TRUE;
+      }
+      CpuMpData->CpuData[Index].Health     = CpuInfoInHob[Index].Health;
+      CpuMpData->CpuData[Index].CpuHealthy = (CpuMpData->CpuData[Index].Health == 0)? TRUE:FALSE;
+      CpuMpData->CpuData[Index].ApFunction = 0;
+      CopyMem (
+        &CpuMpData->CpuData[Index].VolatileRegisters,
+        &CpuMpData->CpuData[0].VolatileRegisters,
+        sizeof (CPU_VOLATILE_REGISTERS)
+        );
+    }
+    //
+    // Wakeup APs to do some AP initialize sync
+    //
+    WakeUpAP (CpuMpData, TRUE, 0, ApInitializeSync, CpuMpData);
+    //
+    // Wait for all APs finished initialization
+    //
+    while (CpuMpData->FinishedCount < (CpuMpData->CpuCount - 1)) {
+      CpuPause ();
+    }
+    CpuMpData->InitFlag = ApInitDone;
+    for (Index = 0; Index < CpuMpData->CpuCount; Index++) {
+      SetApState (&CpuMpData->CpuData[Index], CpuStateIdle);
+    }
+  }
 
-  //
-  // Wakeup all APs and calculate the processor count in system
-  //
-  CollectProcessorCount (CpuMpData);
   //
   // Initialize global data for MP support
   //
@@ -936,6 +985,7 @@ MpInitLibGetNumberOfProcessors (
 {
   return EFI_UNSUPPORTED;
 }
+
 /**
   Get pointer to CPU MP Data structure from GUIDed HOB.
 
-- 
cgit