IntelFsp2Pkg: Remove CarBase and CarSize from FSP_GLOBAL_DATA

[mirror_edk2.git] / IntelFsp2Pkg / FspSecCore / SecFsp.c

diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c
index 7259a55bbd9cce4c9c4f0e1525c9ff4efe52d19a..96f8fb755467f596eac12c1288da478c8a11e762 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
@@ -76,7 +76,7 @@ SecGetPlatformData (
   //\r
   // Pointer to the size field\r
   //\r
   //\r
   // Pointer to the size field\r
   //\r

-  TopOfCar = FspPlatformData->CarBase + FspPlatformData->CarSize;\r
+  TopOfCar = PcdGet32(PcdTemporaryRamBase) + PcdGet32(PcdTemporaryRamSize);\r

   StackPtr = (UINT32 *)(TopOfCar - sizeof (UINT32));\r
 \r
   if (*(StackPtr - 1) == FSP_MCUD_SIGNATURE) {\r
   StackPtr = (UINT32 *)(TopOfCar - sizeof (UINT32));\r
 \r
   if (*(StackPtr - 1) == FSP_MCUD_SIGNATURE) {\r


@@ -140,8 +140,6 @@ FspGlobalDataInit (
   PeiFspData->CoreStack            = BootLoaderStack;\r
   PeiFspData->PerfIdx              = 2;\r
   PeiFspData->PerfSig              = FSP_PERFORMANCE_DATA_SIGNATURE;\r
   PeiFspData->CoreStack            = BootLoaderStack;\r
   PeiFspData->PerfIdx              = 2;\r
   PeiFspData->PerfSig              = FSP_PERFORMANCE_DATA_SIGNATURE;\r

-  PeiFspData->PlatformData.CarBase = AsmReadMsr32 (0x200) & ~(0x6);\r
-  PeiFspData->PlatformData.CarSize = ~(AsmReadMsr32(0x201) & ~(0x800)) + 1;\r

 \r
   SetFspMeasurePoint (FSP_PERF_ID_API_FSP_MEMORY_INIT_ENTRY);\r
 \r
 \r
   SetFspMeasurePoint (FSP_PERF_ID_API_FSP_MEMORY_INIT_ENTRY);\r
 \r