diff options
| author | Satya Yarlagadda <satya.p.yarlagadda@intel.com> | 2016-07-20 14:49:15 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-07-27 09:59:55 +0800 |
| commit | 0fe4114927a4d7b90e0a255ff8421cd210df23f5 (patch) | |
| tree | af0e2da8ad6573e057a009d953b9e361a726dc98 | |
| parent | 17617643d87efb9488f92033f1e52a0912049e9f (diff) | |
| download | edk2-platforms-0fe4114927a4d7b90e0a255ff8421cd210df23f5.tar.xz | |
IntelFsp2Pkg: Remove CarBase and CarSize from FSP_GLOBAL_DATA
CarBase and CarSize in Fsp Global data structure are no longer needed as
Boot loader doesn't pass them to FSP even in case that BL chooses to skip calling
the FspTempRamInit API. In case of FspTempramInit is called, we can use the PCDs
to identify the CarBase and Size. Hence we remove the relevant code.
Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Satya Yarlagadda <satya.p.yarlagadda@intel.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
(cherry picked from commit 40bc7509142af30d8befd198afbdeeaa58964234)
| -rw-r--r-- | IntelFsp2Pkg/FspSecCore/SecFsp.c | 4 | ||||
| -rw-r--r-- | IntelFsp2Pkg/Include/FspGlobalData.h | 2 | ||||
| -rw-r--r-- | IntelFsp2Pkg/Include/Library/FspCommonLib.h | 20 | ||||
| -rw-r--r-- | IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c | 42 |
4 files changed, 1 insertions, 67 deletions
diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c index 7259a55bbd..96f8fb7554 100644 --- a/IntelFsp2Pkg/FspSecCore/SecFsp.c +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c @@ -76,7 +76,7 @@ SecGetPlatformData ( //
// Pointer to the size field
//
- TopOfCar = FspPlatformData->CarBase + FspPlatformData->CarSize;
+ TopOfCar = PcdGet32(PcdTemporaryRamBase) + PcdGet32(PcdTemporaryRamSize);
StackPtr = (UINT32 *)(TopOfCar - sizeof (UINT32));
if (*(StackPtr - 1) == FSP_MCUD_SIGNATURE) {
@@ -140,8 +140,6 @@ FspGlobalDataInit ( PeiFspData->CoreStack = BootLoaderStack;
PeiFspData->PerfIdx = 2;
PeiFspData->PerfSig = FSP_PERFORMANCE_DATA_SIGNATURE;
- PeiFspData->PlatformData.CarBase = AsmReadMsr32 (0x200) & ~(0x6);
- PeiFspData->PlatformData.CarSize = ~(AsmReadMsr32(0x201) & ~(0x800)) + 1;
SetFspMeasurePoint (FSP_PERF_ID_API_FSP_MEMORY_INIT_ENTRY);
diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h b/IntelFsp2Pkg/Include/FspGlobalData.h index a484d16dcc..8ac3199bab 100644 --- a/IntelFsp2Pkg/Include/FspGlobalData.h +++ b/IntelFsp2Pkg/Include/FspGlobalData.h @@ -34,8 +34,6 @@ typedef struct { UINT32 MicrocodeRegionSize;
UINT32 CodeRegionBase;
UINT32 CodeRegionSize;
- UINT32 CarBase;
- UINT32 CarSize;
} FSP_PLAT_DATA;
#define FSP_GLOBAL_DATA_SIGNATURE SIGNATURE_32 ('F', 'S', 'P', 'D')
diff --git a/IntelFsp2Pkg/Include/Library/FspCommonLib.h b/IntelFsp2Pkg/Include/Library/FspCommonLib.h index 231f1e44b3..5f7a14b9b2 100644 --- a/IntelFsp2Pkg/Include/Library/FspCommonLib.h +++ b/IntelFsp2Pkg/Include/Library/FspCommonLib.h @@ -290,26 +290,6 @@ SetPhaseStatusCode ( );
/**
- This function gets FSP CAR base.
-
-**/
-UINT32
-EFIAPI
-GetFspCarBase (
- VOID
- );
-
-/**
- This function gets FSP CAR size.
-
-**/
-UINT32
-EFIAPI
-GetFspCarSize (
- VOID
- );
-
-/**
This function updates the return status of the FSP API with requested reset type and returns to Boot Loader.
@param[in] FspResetType Reset type that needs to returned as API return status
diff --git a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c index 0c5f0b306e..660e9fc696 100644 --- a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c +++ b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c @@ -505,48 +505,6 @@ SetPhaseStatusCode ( }
/**
- This function gets FSP CAR base.
-
-**/
-UINT32
-EFIAPI
-GetFspCarBase (
- VOID
- )
-{
- FSP_GLOBAL_DATA *FspData;
- UINT32 CarBase;
-
- FspData = GetFspGlobalDataPointer ();
- CarBase = FspData->PlatformData.CarBase;
- if (CarBase == 0) {
- CarBase = PcdGet32(PcdTemporaryRamBase);
- }
- return CarBase;
-}
-
-/**
- This function gets FSP CAR size.
-
-**/
-UINT32
-EFIAPI
-GetFspCarSize (
- VOID
- )
-{
- FSP_GLOBAL_DATA *FspData;
- UINT32 CarSize;
-
- FspData = GetFspGlobalDataPointer ();
- CarSize = FspData->PlatformData.CarSize;
- if (FspData->PlatformData.CarBase == 0) {
- CarSize = PcdGet32(PcdTemporaryRamSize);
- }
- return CarSize;
-}
-
-/**
This function updates the return status of the FSP API with requested reset type and returns to Boot Loader.
@param[in] FspResetType Reset type that needs to returned as API return status
|