diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-01-05 23:41:36 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2019-02-13 09:40:05 +0100 |
| commit | 23f5f4abf7d04690e43ab5c58f0b6d5b955ffd97 (patch) | |
| tree | cae918441e0669302eb98b61b0e9cbbead9ba253 /lib | |
| parent | 0ea8741ff65e2b1cf86763b1f6392499df286ce1 (diff) | |
| download | u-boot-23f5f4abf7d04690e43ab5c58f0b6d5b955ffd97.tar.gz | |
efi_loader: fix memory allocation on sandbox
Commit 7b78d6438a2b ("efi_loader: Reserve unaccessible memory") introduced
a comparison between RAM top and RAM start that was not known at the time
when the patch of commit 49759743bf09 ("efi_loader: eliminate sandbox
addresses") was written.
The sandbox uses an address space that is only relevant in the sandbox
context. We have to map ram_top from the sandbox address space to the
physical address space before using it in the EFI subsystem.
Fixes: 49759743bf09 ("efi_loader: eliminate sandbox addresses")
Fixes: 7b78d6438a2b ("efi_loader: Reserve unaccessible memory")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/efi_memory.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 4bb517473e..ebd2b36c03 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -554,6 +554,12 @@ __weak void efi_add_known_memory(void) u64 ram_top = board_get_usable_ram_top(0) & ~EFI_PAGE_MASK; int i; + /* + * ram_top is just outside mapped memory. So use an offset of one for + * mapping the sandbox address. + */ + ram_top = (uintptr_t)map_sysmem(ram_top - 1, 0) + 1; + /* Fix for 32bit targets with ram_top at 4G */ if (!ram_top) ram_top = 0x100000000ULL; |