tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-25 14:44:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

StandaloneMmPkg: Support using gEfiSmmSmramMemoryGuid to get MMRAM range

Browse Source 
Add the support using gEfiSmmSmramMemoryGuid to get MMRAM ranges.
If gEfiSmmSmramMemoryGuid HOB is not found, then try to get MMRAM ranges
from gEfiMmPeiMmramMemoryReserveGuid HOB.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Wei6 Xu <wei6.xu@intel.com>
This commit is contained in:
Wei6 Xu 2024-05-14 02:54:44 +08:00 committed by mergify[bot]
parent 487fa274c4
commit c8df60801f
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
StandaloneMmPkg/Core/StandaloneMmCore.c
View File

@ -669,9 +669,12 @@ StandaloneMmMain (
// //
// Extract the MMRAM ranges from the MMRAM descriptor HOB // Extract the MMRAM ranges from the MMRAM descriptor HOB
// //
MmramRangesHob = GetNextGuidHob (&gEfiMmPeiMmramMemoryReserveGuid, HobStart); MmramRangesHob = GetNextGuidHob (&gEfiSmmSmramMemoryGuid, HobStart);
if (MmramRangesHob == NULL) { if (MmramRangesHob == NULL) {
return EFI_UNSUPPORTED; MmramRangesHob = GetNextGuidHob (&gEfiMmPeiMmramMemoryReserveGuid, HobStart);
if (MmramRangesHob == NULL) {
return EFI_UNSUPPORTED;
}
} }
MmramRangesHobData = GET_GUID_HOB_DATA (MmramRangesHob); MmramRangesHobData = GET_GUID_HOB_DATA (MmramRangesHob);

1
StandaloneMmPkg/Core/StandaloneMmCore.inf
View File

@ -76,6 +76,7 @@
gEfiEventExitBootServicesGuid gEfiEventExitBootServicesGuid
gEfiEventReadyToBootGuid gEfiEventReadyToBootGuid
gMmCommBufferHobGuid gMmCommBufferHobGuid
gEfiSmmSmramMemoryGuid
[Pcd] [Pcd]
gStandaloneMmPkgTokenSpaceGuid.PcdFwVolMmMaxEncapsulationDepth ##CONSUMES gStandaloneMmPkgTokenSpaceGuid.PcdFwVolMmMaxEncapsulationDepth ##CONSUMES

7
StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.c
View File

@ -857,9 +857,12 @@ MemoryAllocationLibConstructor (
// //
// Search for a Hob containing the MMRAM ranges // Search for a Hob containing the MMRAM ranges
// //
MmramRangesHob = GetNextGuidHob (&gEfiMmPeiMmramMemoryReserveGuid, HobStart); MmramRangesHob = GetNextGuidHob (&gEfiSmmSmramMemoryGuid, HobStart);
if (MmramRangesHob == NULL) { if (MmramRangesHob == NULL) {
return EFI_UNSUPPORTED; MmramRangesHob = GetNextGuidHob (&gEfiMmPeiMmramMemoryReserveGuid, HobStart);
if (MmramRangesHob == NULL) {
return EFI_UNSUPPORTED;
}
} }
MmramRangesHobData = GET_GUID_HOB_DATA (MmramRangesHob); MmramRangesHobData = GET_GUID_HOB_DATA (MmramRangesHob);

1
StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.inf
View File

@ -42,3 +42,4 @@
[Guids] [Guids]
gEfiMmPeiMmramMemoryReserveGuid gEfiMmPeiMmramMemoryReserveGuid
gEfiSmmSmramMemoryGuid

1
StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
View File

@ -52,3 +52,4 @@
[Guids] [Guids]
gEfiMmPeiMmramMemoryReserveGuid ## SOMETIMES_CONSUMES ## HOB gEfiMmPeiMmramMemoryReserveGuid ## SOMETIMES_CONSUMES ## HOB
gEfiSmmSmramMemoryGuid ## SOMETIMES_CONSUMES ## HOB

7
StandaloneMmPkg/Library/StandaloneMmMemLib/X86StandaloneMmMemLibInternal.c
View File

@ -96,9 +96,12 @@ MmMemLibInternalPopulateMmramRanges (
// //
// Search for a Hob containing the MMRAM ranges // Search for a Hob containing the MMRAM ranges
// //
MmramRangesHob = GetFirstGuidHob (&gEfiMmPeiMmramMemoryReserveGuid); MmramRangesHob = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
if (MmramRangesHob == NULL) { if (MmramRangesHob == NULL) {
return EFI_UNSUPPORTED; MmramRangesHob = GetFirstGuidHob (&gEfiMmPeiMmramMemoryReserveGuid);
if (MmramRangesHob == NULL) {
return EFI_UNSUPPORTED;
}
} }
MmramRangesHobData = GET_GUID_HOB_DATA (MmramRangesHob); MmramRangesHobData = GET_GUID_HOB_DATA (MmramRangesHob);