Revert "efi_loader: efi_allocate_pages is too restrictive"
authorStephen Warren <swarren@nvidia.com>
Thu, 2 Aug 2018 17:45:57 +0000 (11:45 -0600)
committerAlexander Graf <agraf@suse.de>
Mon, 20 Aug 2018 09:39:19 +0000 (11:39 +0200)
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 <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
lib/efi_loader/efi_memory.c

index 967c3f733e4c581e2e0adc13c7507d6cf74c71f5..4b6269f35e11db2cdef00081086544a7cbe5abd7 100644 (file)
@@ -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;