diff mbox series

[Concept,v2,13/22] efi: app: Allocate pages in any region

Message ID	20250819185900.835939-14-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Tue, 19 Aug 2025 12:58:44 -0600 Message-ID: <20250819185900.835939-14-sjg@u-boot.org> In-Reply-To: <20250819185900.835939-1-sjg@u-boot.org> References: <20250819185900.835939-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: FIYE4MI343GASKR25A4BOCTVMVMSMQZR CC: Simon Glass <sjg@chromium.org> Precedence: list Subject: [Concept] [PATCH v2 13/22] efi: app: Allocate pages in any region Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/FIYE4MI343GASKR25A4BOCTVMVMSMQZR/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	efi: Improvements for the EFI app on ARM \| [Concept,v2,00/22] efi: Improvements for the EFI app on ARM [Concept,v2,01/22] arm: bootm: Add some debugging [Concept,v2,02/22] arm: Fix swtiching typo [Concept,v2,03/22] arm: Show the exception level with bdinfo [Concept,v2,04/22] arm: Drop kernel_entry for arm64 [Concept,v2,05/22] meminfo: Allow for up to 10 hex digits [Concept,v2,06/22] event: Add a dummy function for event_notify() [Concept,v2,07/22] boot: Improve debugging in bootm_load_os() [Concept,v2,08/22] boot: Pass flags to the bootm_final event [Concept,v2,09/22] fdt: Add debugging for fdt_simplefb [Concept,v2,10/22] efi: app: Show only a summary of disks and partitions [Concept,v2,11/22] efi: Fix up the addr_find command [Concept,v2,12/22] efi: app: Tidy up some stale comments in setup_memory() [Concept,v2,13/22] efi: app: Allocate pages in any region [Concept,v2,14/22] efi: app: Pick up the SMBIOS table [Concept,v2,15/22] efi: app: Use EFI_PAGE_SHIFT instead of 12 in free_memory() [Concept,v2,16/22] efi: app: Print the final message before freeing memory [Concept,v2,17/22] efi: app: Use the relocated global_data [Concept,v2,18/22] efi: app: Only show the memory map when debugging [Concept,v2,19/22] efi: app: Add a simplefb node to the devicetree [Concept,v2,20/22] efi: arm: Increase the cyclic timeout again [Concept,v2,21/22] efi: app: Show the model when the vidconsole starts [Concept,v2,22/22] efi: app: Enable the cat command

Commit Message

Simon Glass Aug. 19, 2025, 6:58 p.m. UTC

  From: Simon Glass <sjg@chromium.org>

Rather than immediately falling back to the pool allocator when we
cannot get enough memory below 4GB, try the page allocator first. This
provides 4K-aligned memory, which is nicer to look at when debugging.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 lib/efi_client/efi_app.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff mbox series

Patch

diff --git a/lib/efi_client/efi_app.c b/lib/efi_client/efi_app.c
index 764e562692e..92aee94a695 100644
--- a/lib/efi_client/efi_app.c
+++ b/lib/efi_client/efi_app.c
@@ -112,6 +112,11 @@  static efi_status_t setup_memory(struct efi_priv *priv)
 	addr = 1ULL << 32;
 	ret = boot->allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
 				   priv->image_data_type, pages, &addr);
+	if (ret) {
+		log_info("(any address) ");
+		ret = boot->allocate_pages(EFI_ALLOCATE_ANY_PAGES,
+					   priv->image_data_type, pages, &addr);
+	}
 	if (ret) {
 		log_info("(using pool %lx) ", ret);
 		priv->ram_base = (ulong)efi_malloc(priv, CONFIG_EFI_RAM_SIZE,
@@ -123,6 +128,7 @@  static efi_status_t setup_memory(struct efi_priv *priv)
 		log_info("(using allocated RAM address %lx) ", (ulong)addr);
 		priv->ram_base = addr;
 	}
+	gd->ram_base = addr;
 	gd->ram_size = pages << 12;
 
 	return 0;