UefiCpuPkg CpuMpPei: Update return status to follow spec.

[mirror_edk2.git] / UefiCpuPkg / Library / MpInitLib / MpLib.c

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 735e099b32f28e934ca20603679574bf82a02a30..df19b43bc03a0ba73dc0effc5802a2279be5bf67 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -451,6 +451,12 @@ CollectProcessorCount (
     CpuPause ();\r
   }\r
 \r
+  if (CpuMpData->CpuCount > 255) {\r
+    //\r
+    // If there are more than 255 processor found, force to enable X2APIC\r
+    //\r
+    CpuMpData->X2ApicEnable = TRUE;\r
+  }\r
   if (CpuMpData->X2ApicEnable) {\r
     DEBUG ((DEBUG_INFO, "Force x2APIC mode!\n"));\r
     //\r
@@ -547,6 +553,7 @@ ApWakeupFunction (
   volatile UINT32            *ApStartupSignalBuffer;\r
   CPU_INFO_IN_HOB            *CpuInfoInHob;\r
   UINT64                     ApTopOfStack;\r
+  UINTN                      CurrentApicMode;\r
 \r
   //\r
   // AP finished assembly code and begin to execute C code\r
@@ -560,6 +567,7 @@ ApWakeupFunction (
   ProgramVirtualWireMode ();\r
   SyncLocalApicTimerSetting (CpuMpData);\r
 \r
+  CurrentApicMode = GetApicMode ();\r
   while (TRUE) {\r
     if (CpuMpData->InitFlag == ApInitConfig) {\r
       //\r
@@ -627,11 +635,23 @@ ApWakeupFunction (
             ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal;\r
             CpuInfoInHob[ProcessorNumber].ApTopOfStack = CpuInfoInHob[CpuMpData->NewBspNumber].ApTopOfStack;\r
           } else {\r
-            //\r
-            // Re-get the CPU APICID and Initial APICID\r
-            //\r
-            CpuInfoInHob[ProcessorNumber].ApicId        = GetApicId ();\r
-            CpuInfoInHob[ProcessorNumber].InitialApicId = GetInitialApicId ();\r
+            if (CpuInfoInHob[ProcessorNumber].ApicId != GetApicId () ||\r
+                CpuInfoInHob[ProcessorNumber].InitialApicId != GetInitialApicId ()) {\r
+              if (CurrentApicMode != GetApicMode ()) {\r
+                //\r
+                // If APIC mode change happened during AP function execution,\r
+                // we do not support APIC ID value changed.\r
+                //\r
+                ASSERT (FALSE);\r
+                CpuDeadLoop ();\r
+              } else {\r
+                //\r
+                // Re-get the CPU APICID and Initial APICID if they are changed\r
+                //\r
+                CpuInfoInHob[ProcessorNumber].ApicId        = GetApicId ();\r
+                CpuInfoInHob[ProcessorNumber].InitialApicId = GetInitialApicId ();\r
+              }\r
+            }\r
           }\r
         }\r
         SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateFinished);\r
@@ -1398,7 +1418,7 @@ MpInitLibInitialize (
     CpuInfoInHob = (CPU_INFO_IN_HOB *) (UINTN) CpuMpData->CpuInfoInHob;\r
     for (Index = 0; Index < CpuMpData->CpuCount; Index++) {\r
       InitializeSpinLock(&CpuMpData->CpuData[Index].ApLock);\r
-      if (CpuInfoInHob[Index].InitialApicId >= 255) {\r
+      if (CpuInfoInHob[Index].InitialApicId >= 255 || Index > 254) {\r
         CpuMpData->X2ApicEnable = TRUE;\r
       }\r
       CpuMpData->CpuData[Index].CpuHealthy = (CpuInfoInHob[Index].Health == 0)? TRUE:FALSE;\r