UefiCpuPkg/MpInitLib: fix wrong address set as Stack Guard for APs

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

diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
index 40c1bf407af2c42023fa6ff4ef2c252c7e6a3618..e832c16ecacec771b7a5be37a77520a9942b17c6 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
@@ -295,6 +295,7 @@ InitMpGlobalData (
   UINTN                               Index;\r
   EFI_GCD_MEMORY_SPACE_DESCRIPTOR     MemDesc;\r
   UINTN                               StackBase;\r
   UINTN                               Index;\r
   EFI_GCD_MEMORY_SPACE_DESCRIPTOR     MemDesc;\r
   UINTN                               StackBase;\r

+  CPU_INFO_IN_HOB                     *CpuInfoInHob;\r

 \r
   SaveCpuMpData (CpuMpData);\r
 \r
 \r
   SaveCpuMpData (CpuMpData);\r
 \r


@@ -314,8 +315,21 @@ InitMpGlobalData (
       ASSERT (FALSE);\r
     }\r
 \r
       ASSERT (FALSE);\r
     }\r
 \r

+    //\r
+    // DXE will reuse stack allocated for APs at PEI phase if it's available.\r
+    // Let's check it here.\r
+    //\r
+    // Note: BSP's stack guard is set at DxeIpl phase. But for the sake of\r
+    // BSP/AP exchange, stack guard for ApTopOfStack of cpu 0 will still be\r
+    // set here.\r
+    //\r
+    CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob;\r

     for (Index = 0; Index < CpuMpData->CpuCount; ++Index) {\r
     for (Index = 0; Index < CpuMpData->CpuCount; ++Index) {\r

-      StackBase = CpuMpData->Buffer + Index * CpuMpData->CpuApStackSize;\r
+      if (CpuInfoInHob != NULL && CpuInfoInHob[Index].ApTopOfStack != 0) {\r
+        StackBase = CpuInfoInHob[Index].ApTopOfStack - CpuMpData->CpuApStackSize;\r
+      } else {\r
+        StackBase = CpuMpData->Buffer + Index * CpuMpData->CpuApStackSize;\r
+      }\r

 \r
       Status = gDS->GetMemorySpaceDescriptor (StackBase, &MemDesc);\r
       ASSERT_EFI_ERROR (Status);\r
 \r
       Status = gDS->GetMemorySpaceDescriptor (StackBase, &MemDesc);\r
       ASSERT_EFI_ERROR (Status);\r


@@ -326,6 +340,9 @@ InitMpGlobalData (
                       MemDesc.Attributes | EFI_MEMORY_RP\r
                       );\r
       ASSERT_EFI_ERROR (Status);\r
                       MemDesc.Attributes | EFI_MEMORY_RP\r
                       );\r
       ASSERT_EFI_ERROR (Status);\r

+\r
+      DEBUG ((DEBUG_INFO, "Stack Guard set at %lx [cpu%lu]!\n",\r
+              (UINT64)StackBase, (UINT64)Index));\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r