tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg SmmIpl: Fill Smram range for SMM driver when LMFA enable 

Allocate the additional Smram range to describe the reserved smram for
SMM core and driver when LMFA feature is enabled.

Cc: Star Zeng <star.zeng@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Liming Gao 2016-12-01 14:49:33 +08:00
parent ddfae2640c
commit a7d10bb09d
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c
View File

@ -973,6 +973,10 @@ ExecuteSmmCoreFromSmram (
// Since the memory range to load SMM CORE will be cut out in SMM core, so no need to allocate and free this range // Since the memory range to load SMM CORE will be cut out in SMM core, so no need to allocate and free this range
// //
PageCount = 0; PageCount = 0;
//
// Reserved Smram Region for SmmCore is not used, and remove it from SmramRangeCount.
//
gSmmCorePrivate->SmramRangeCount --;
} else { } else {
DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR: Loading module at fixed address at address failed\n")); DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR: Loading module at fixed address at address failed\n"));
// //
@ -1299,6 +1303,7 @@ GetFullSmramRanges (
UINTN Index2; UINTN Index2;
EFI_SMRAM_DESCRIPTOR *FullSmramRanges; EFI_SMRAM_DESCRIPTOR *FullSmramRanges;
UINTN TempSmramRangeCount; UINTN TempSmramRangeCount;
UINTN AdditionSmramRangeCount;
EFI_SMRAM_DESCRIPTOR *TempSmramRanges; EFI_SMRAM_DESCRIPTOR *TempSmramRanges;
UINTN SmramRangeCount; UINTN SmramRangeCount;
EFI_SMRAM_DESCRIPTOR *SmramRanges; EFI_SMRAM_DESCRIPTOR *SmramRanges;
@ -1332,12 +1337,22 @@ GetFullSmramRanges (
} }
} }
//
// Reserve one entry for SMM Core in the full SMRAM ranges.
//
AdditionSmramRangeCount = 1;
if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {
//
// Reserve two entries for all SMM drivers and SMM Core in the full SMRAM ranges.
//
AdditionSmramRangeCount = 2;
}
if (SmramReservedCount == 0) { if (SmramReservedCount == 0) {
// //
// No reserved SMRAM entry from SMM Configuration Protocol. // No reserved SMRAM entry from SMM Configuration Protocol.
// Reserve one entry for SMM Core in the full SMRAM ranges.
// //
*FullSmramRangeCount = SmramRangeCount + 1; *FullSmramRangeCount = SmramRangeCount + AdditionSmramRangeCount;
Size = (*FullSmramRangeCount) * sizeof (EFI_SMRAM_DESCRIPTOR); Size = (*FullSmramRangeCount) * sizeof (EFI_SMRAM_DESCRIPTOR);
FullSmramRanges = (EFI_SMRAM_DESCRIPTOR *) AllocateZeroPool (Size); FullSmramRanges = (EFI_SMRAM_DESCRIPTOR *) AllocateZeroPool (Size);
ASSERT (FullSmramRanges != NULL); ASSERT (FullSmramRanges != NULL);
@ -1449,10 +1464,9 @@ GetFullSmramRanges (
ASSERT (TempSmramRangeCount <= MaxCount); ASSERT (TempSmramRangeCount <= MaxCount);
// //
// Sort the entries, // Sort the entries
// and reserve one entry for SMM Core in the full SMRAM ranges.
// //
FullSmramRanges = AllocateZeroPool ((TempSmramRangeCount + 1) * sizeof (EFI_SMRAM_DESCRIPTOR)); FullSmramRanges = AllocateZeroPool ((TempSmramRangeCount + AdditionSmramRangeCount) * sizeof (EFI_SMRAM_DESCRIPTOR));
ASSERT (FullSmramRanges != NULL); ASSERT (FullSmramRanges != NULL);
*FullSmramRangeCount = 0; *FullSmramRangeCount = 0;
do { do {
@ -1472,7 +1486,7 @@ GetFullSmramRanges (
TempSmramRanges[Index].PhysicalSize = 0; TempSmramRanges[Index].PhysicalSize = 0;
} while (*FullSmramRangeCount < TempSmramRangeCount); } while (*FullSmramRangeCount < TempSmramRangeCount);
ASSERT (*FullSmramRangeCount == TempSmramRangeCount); ASSERT (*FullSmramRangeCount == TempSmramRangeCount);
*FullSmramRangeCount += 1; *FullSmramRangeCount += AdditionSmramRangeCount;
FreePool (SmramRanges); FreePool (SmramRanges);
FreePool (SmramReservedRanges); FreePool (SmramReservedRanges);
@ -1510,6 +1524,7 @@ SmmIplEntry (
EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE *LMFAConfigurationTable; EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE *LMFAConfigurationTable;
EFI_CPU_ARCH_PROTOCOL *CpuArch; EFI_CPU_ARCH_PROTOCOL *CpuArch;
EFI_STATUS SetAttrStatus; EFI_STATUS SetAttrStatus;
EFI_SMRAM_DESCRIPTOR *SmramRangeSmmDriver;
// //
// Fill in the image handle of the SMM IPL so the SMM Core can use this as the // Fill in the image handle of the SMM IPL so the SMM Core can use this as the
@ -1619,6 +1634,19 @@ SmmIplEntry (
// //
DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: TSEG BASE is %x. \n", LMFAConfigurationTable->SmramBase)); DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: TSEG BASE is %x. \n", LMFAConfigurationTable->SmramBase));
} }
//
// Fill the Smram range for all SMM code
//
SmramRangeSmmDriver = &gSmmCorePrivate->SmramRanges[gSmmCorePrivate->SmramRangeCount - 2];
SmramRangeSmmDriver->CpuStart = mCurrentSmramRange->CpuStart;
SmramRangeSmmDriver->PhysicalStart = mCurrentSmramRange->PhysicalStart;
SmramRangeSmmDriver->RegionState = mCurrentSmramRange->RegionState | EFI_ALLOCATED;
SmramRangeSmmDriver->PhysicalSize = SmmCodeSize;
mCurrentSmramRange->PhysicalSize -= SmmCodeSize;
mCurrentSmramRange->CpuStart = mCurrentSmramRange->CpuStart + SmmCodeSize;
mCurrentSmramRange->PhysicalStart = mCurrentSmramRange->PhysicalStart + SmmCodeSize;
} }
// //
// Load SMM Core into SMRAM and execute it from SMRAM // Load SMM Core into SMRAM and execute it from SMRAM