ArmPlatformPkg: Changed the reference base of the PI Global Pointer Offset

[mirror_edk2.git] / ArmPlatformPkg / Library / PeiServicesTablePointerLib / PeiServicesTablePointer.c

diff --git a/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c b/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
index 8a47e8d8a743469397189787f2cd50e4bd55caf4..0e6755d3aa015cdbaaefbf0d71869c339fa559ae 100644 (file)
--- a/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
+++ b/ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
@@ -39,7 +39,10 @@ SetPeiServicesTablePointer (
   UINTN *PeiPtrLoc;\r
   ASSERT (PeiServicesTablePointer != NULL);\r
 \r
-  PeiPtrLoc = (UINTN *)(UINTN)(PcdGet32 (PcdCPUCoresNonSecStackBase) + (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - PcdGet32 (PcdPeiServicePtrGlobalOffset));\r
+  PeiPtrLoc = (UINTN *)(UINTN)(PcdGet32 (PcdCPUCoresNonSecStackBase) + \r
+                               (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - \r
+                               PcdGet32 (PcdPeiGlobalVariableSize) +\r
+                               PcdGet32 (PcdPeiServicePtrGlobalOffset));\r
   *PeiPtrLoc = (UINTN)PeiServicesTablePointer;\r
 }\r
 \r
@@ -63,7 +66,10 @@ GetPeiServicesTablePointer (
 {\r
   UINTN *PeiPtrLoc;\r
 \r
-  PeiPtrLoc = (UINTN *)(UINTN)(PcdGet32 (PcdCPUCoresNonSecStackBase) + (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - PcdGet32 (PcdPeiServicePtrGlobalOffset));\r
+  PeiPtrLoc = (UINTN *)(UINTN)(PcdGet32 (PcdCPUCoresNonSecStackBase) + \r
+                               (PcdGet32 (PcdCPUCoresNonSecStackSize) / 2) - \r
+                               PcdGet32 (PcdPeiGlobalVariableSize) +\r
+                               PcdGet32 (PcdPeiServicePtrGlobalOffset));\r
   return (CONST EFI_PEI_SERVICES **)*PeiPtrLoc;\r
 }\r
 \r