From: Stephen Warren Date: Thu, 2 Aug 2018 17:45:57 +0000 (-0600) Subject: Revert "efi_loader: efi_allocate_pages is too restrictive" X-Git-Tag: v2018.09-rc3~33^2~14 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ccfc78b820e5e431c5bd73b072e7536a972e1710;p=oweals%2Fu-boot.git Revert "efi_loader: efi_allocate_pages is too restrictive" This reverts commit aa909462d01866354f4cd4534db5f571c2cf1fbb. This change caused "dhcp filename" to crash the system on p2371-2180 (Jetson TX1), for example when running test/py. Reverting this change isn't optimal, but at least restores TX1 to a working state. In the future, we should: a) Fix whatever problem causes the crash with this patch applied. This needs further discussion, so isn't something we can immediately do. b) Undo the revert; re-apply the original patch to efi_allocate_pages. Signed-off-by: Stephen Warren Reviewed-by: Simon Glass Signed-off-by: Alexander Graf --- diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 967c3f733e..4b6269f35e 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -305,7 +305,7 @@ efi_status_t efi_allocate_pages(int type, int memory_type, switch (type) { case EFI_ALLOCATE_ANY_PAGES: /* Any page */ - addr = efi_find_free_memory(len, -1ULL); + addr = efi_find_free_memory(len, gd->start_addr_sp); if (!addr) { r = EFI_NOT_FOUND; break;