From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smarthost01b.ixn.mail.zen.net.uk (smarthost01b.ixn.mail.zen.net.uk [212.23.1.21]) by mx.groups.io with SMTP id smtpd.web11.2495.1643403871648946815 for ; Fri, 28 Jan 2022 13:04:32 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=permerror, err=parse error for token &{10 18 sdn.klaviyomail.com}: permanent DNS error (domain: starlabs.systems, ip: 212.23.1.21, mailfrom: sean@starlabs.systems) Received: from [217.155.46.38] (helo=sean-StarBook.lan) by smarthost01b.ixn.mail.zen.net.uk with esmtp (Exim 4.90_1) (envelope-from ) id 1nDYQ1-0005lP-Fq; Fri, 28 Jan 2022 21:04:29 +0000 From: sean@starlabs.systems To: devel@edk2.groups.io Cc: Sean Rhodes Subject: [PATCH 32/32] UefiPayloadPkg: Add build option for Above 4G Memory Date: Fri, 28 Jan 2022 21:04:24 +0000 Message-Id: <496801044bee6eec3aad6ddf4a9c823daeb13b9f.1643403631.git.sean@starlabs.systems> X-Mailer: git-send-email 2.32.0 In-Reply-To: <9dd14fc91c174eae87fd122c7ac70073a363527f.1643403631.git.sean@starlabs.systems> References: <9dd14fc91c174eae87fd122c7ac70073a363527f.1643403631.git.sean@starlabs.systems> MIME-Version: 1.0 X-Originating-smarthost01b-IP: [217.155.46.38] Feedback-ID: 217.155.46.38 Content-Transfer-Encoding: quoted-printable When build option ABOVE_4G_MEMORY is set to true, nothing will change and EDKII will use all available memory. Setting it to false will create memory type information HOB in payload entry, so that EDKII will reserve enough memory below 4G for EDKII modules. This option is useful for bootloaders that are not fully 64-bit aware such as Qubes R4.0.4 bootloader, Zorin and Proxmox. Signed-off-by: Sean Rhodes --- .../UefiPayloadEntry/UefiPayloadEntry.c | 41 +++++++++++++++++++ .../UefiPayloadEntry/UefiPayloadEntry.inf | 7 ++++ UefiPayloadPkg/UefiPayloadPkg.dec | 3 ++ UefiPayloadPkg/UefiPayloadPkg.dsc | 7 ++++ 4 files changed, 58 insertions(+) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPaylo= adPkg/UefiPayloadEntry/UefiPayloadEntry.c index 0fed1e3691..e343956a1a 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c @@ -5,10 +5,46 @@ =0D **/=0D =0D +#include =0D #include "UefiPayloadEntry.h"=0D =0D STATIC UINT32 mTopOfLowerUsableDram =3D 0;=0D =0D +/**=0D + Function to reserve memory below 4GB for EDKII Modules.=0D +=0D + This causes the DXE to dispatch everything under 4GB and allows Operati= ng=0D + System's that require EFI_LOADED_IMAGE to be under 4GB to start.=0D + e.g. Xen hypervisor used in Qubes=0D +=0D + @param None=0D +=0D + @retval None=0D +**/=0D +VOID=0D +ForceModulesBelow4G (=0D + VOID=0D + )=0D +{=0D + DEBUG ((DEBUG_INFO, "Building hob to restrict memory resorces to below 4= G.\n"));=0D + EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] =3D {=0D + { EfiACPIReclaimMemory, FixedPcdGet32 (PcdMemoryTypeEfiACPIReclaimMe= mory) },=0D + { EfiACPIMemoryNVS, FixedPcdGet32 (PcdMemoryTypeEfiACPIMemoryNVS= ) },=0D + { EfiReservedMemoryType, FixedPcdGet32 (PcdMemoryTypeEfiReservedMemor= yType) },=0D + { EfiRuntimeServicesData, FixedPcdGet32 (PcdMemoryTypeEfiRuntimeServic= esData) },=0D + { EfiRuntimeServicesCode, FixedPcdGet32 (PcdMemoryTypeEfiRuntimeServic= esCode) },=0D + { EfiMaxMemoryType, 0 }=0D + };=0D + //=0D + // Create Memory Type Information HOB=0D + //=0D + BuildGuidDataHob (=0D + &gEfiMemoryTypeInformationGuid,=0D + mDefaultMemoryTypeInformation,=0D + sizeof(mDefaultMemoryTypeInformation)=0D + );=0D +}=0D +=0D /**=0D Callback function to build resource descriptor HOB=0D =0D @@ -438,6 +474,11 @@ _ModuleEntryPoint ( // Build other HOBs required by DXE=0D BuildGenericHob ();=0D =0D + // Create a HOB to make resources for EDKII modules below 4G=0D + if (FixedPcdGetBool (PcdAbove4GMemory) =3D=3D FALSE) {=0D + ForceModulesBelow4G ();=0D + }=0D +=0D // Load the DXE Core=0D Status =3D LoadDxeCore (&DxeCoreEntryPoint);=0D ASSERT_EFI_ERROR (Status);=0D diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf b/UefiPay= loadPkg/UefiPayloadEntry/UefiPayloadEntry.inf index 1847d6481a..2ca47e3bb5 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf @@ -86,8 +86,15 @@ gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize=0D gUefiPayloadPkgTokenSpaceGuid.PcdBootloaderParameter=0D gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSize=0D + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS=0D + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory=0D + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType=0D + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData=0D + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode=0D =0D gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack ## SOMETIM= ES_CONSUMES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy ## SOMETIM= ES_CONSUMES=0D gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy ## SOMETIM= ES_CONSUMES=0D =0D + gUefiPayloadPkgTokenSpaceGuid.PcdAbove4GMemory=0D +=0D diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayload= Pkg.dec index 551f0a4915..3915a0579b 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dec +++ b/UefiPayloadPkg/UefiPayloadPkg.dec @@ -83,6 +83,9 @@ gUefiPayloadPkgTokenSpaceGuid.PcdSystemMemoryUefiRegionSi= ze|0x04000000|UINT32|0x =0D gUefiPayloadPkgTokenSpaceGuid.PcdPcdDriverFile|{ 0x57, 0x72, 0xcf, 0x80, 0= xab, 0x87, 0xf9, 0x47, 0xa3, 0xfe, 0xD5, 0x0B, 0x76, 0xd8, 0x95, 0x41 }|VOI= D*|0x00000018=0D =0D +# Above 4G Memory=0D +gUefiPayloadPkgTokenSpaceGuid.PcdAbove4GMemory|1|UINT32|0x00000019=0D +=0D ## FFS filename to find the default variable initial data file.=0D # @Prompt FFS Name of variable initial data file=0D gUefiPayloadPkgTokenSpaceGuid.PcdNvsDataFile |{ 0x1a, 0xf1, 0xb1, 0xae, 0= x42, 0xcc, 0xcf, 0x4e, 0xac, 0x60, 0xdb, 0xab, 0xf6, 0xca, 0x69, 0xe6 }|VOI= D*|0x00000025=0D diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 1ce96a51c1..9fda5f652e 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -33,6 +33,7 @@ DEFINE UNIVERSAL_PAYLOAD =3D FALSE=0D DEFINE SECURITY_STUB_ENABLE =3D TRUE=0D DEFINE SMM_SUPPORT =3D FALSE=0D + DEFINE ABOVE_4G_MEMORY =3D TRUE=0D #=0D # SBL: UEFI payload for Slim Bootloader=0D # COREBOOT: UEFI payload for coreboot=0D @@ -399,6 +400,12 @@ gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask | 0x1=0D !endif=0D =0D +!if $(ABOVE_4G_MEMORY) =3D=3D TRUE=0D + gUefiPayloadPkgTokenSpaceGuid.PcdAbove4GMemory|TRUE=0D +!else=0D + gUefiPayloadPkgTokenSpaceGuid.PcdAbove4GMemory|FALSE=0D +!endif=0D +=0D [PcdsPatchableInModule.X64]=0D gPcAtChipsetPkgTokenSpaceGuid.PcdRtcIndexRegister|$(RTC_INDEX_REGISTER)= =0D gPcAtChipsetPkgTokenSpaceGuid.PcdRtcTargetRegister|$(RTC_TARGET_REGISTER= )=0D --=20 2.32.0