From aa8431822b7631659586247b1e50d21126f3cfcc Mon Sep 17 00:00:00 2001 From: Jeff Brasen Date: Mon, 15 May 2023 23:48:56 +0000 Subject: MdeModulePkg/DxeCore: Allow relocation of images with large address Add PCD to control if modules with start addresses in PE/COFF > 0x100000 attempt to load at specified address. If a module has an address in this range and there is untested memory DxeCore will attempt to promote all memory to tested which bypasses any memory testing that would occur later in boot. There are several existing AARCH64 option roms that have base addresses of 0x180000000. Signed-off-by: Jeff Brasen Reviewed-by: Ashish Singhal Message-Id: Reviewed-by: Liming Gao --- MdeModulePkg/Core/Dxe/DxeMain.inf | 1 + MdeModulePkg/Core/Dxe/Image/Image.c | 4 +++- MdeModulePkg/MdeModulePkg.dec | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf index 35d5bf0dee..16871f2021 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -187,6 +187,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdFwVolDxeMaxEncapsulationDepth ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdImageLargeAddressLoad ## CONSUMES # [Hob] # RESOURCE_DESCRIPTOR ## CONSUMES diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c index 9dbfb2a1fa..6bc3a549ae 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -680,7 +680,9 @@ CoreLoadPeImage ( ); } } else { - if ((Image->ImageContext.ImageAddress >= 0x100000) || Image->ImageContext.RelocationsStripped) { + if ((PcdGetBool (PcdImageLargeAddressLoad) && ((Image->ImageContext.ImageAddress) >= 0x100000)) || + Image->ImageContext.RelocationsStripped) + { Status = CoreAllocatePages ( AllocateAddress, (EFI_MEMORY_TYPE)(Image->ImageContext.ImageCodeMemoryType), diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index dd182c02fd..d2fede4f87 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -1125,6 +1125,13 @@ # @Prompt Output MMIO address of Trace Hub message. gEfiMdeModulePkgTokenSpaceGuid.PcdTraceHubDebugMmioAddress|0|UINT64|0x30001058 + ## Indicates if images with large load address (>0x100000) should attempted to load at specified location. + # If enabled, attempt to allocate at specfied location will be attempted with a fall back to any address. + # TRUE - UEFI will attempt to load at specified location.
+ # FALSE - UEFI will load at any address
+ # @Prompt Enable large address image loading. + gEfiMdeModulePkgTokenSpaceGuid.PcdImageLargeAddressLoad|TRUE|BOOLEAN|0x30001059 + [PcdsFixedAtBuild, PcdsPatchableInModule] ## Dynamic type PCD can be registered callback function for Pcd setting action. # PcdMaxPeiPcdCallBackNumberPerPcdEntry indicates the maximum number of callback function -- cgit v1.2.3