On 12/04/2017 10:28 PM, Simon Glass wrote:
> With sandbox the U-Boot code is not mapped into the sandbox memory range
> so does not need to be excluded when allocating EFI memory. Update the EFI
> memory init code to take account of that.
>
> Also use mapmem instead of a cast to convert a memory address to a
> pointer.
>
> Signed-off-by: Simon Glass <s...@chromium.org>
> ---
>
> Changes in v2:
> - Update to use mapmem instead of a cast
>
> lib/efi_loader/efi_memory.c | 31 ++++++++++++++++++-------------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
> index e95896ca0a..3ad58d8930 100644
> --- a/lib/efi_loader/efi_memory.c
> +++ b/lib/efi_loader/efi_memory.c
> @@ -10,6 +10,7 @@
> #include <efi_loader.h>
> #include <inttypes.h>
> #include <malloc.h>
> +#include <mapmem.h>
> #include <watchdog.h>
> #include <asm/global_data.h>
> #include <linux/list_sort.h>
> @@ -366,7 +367,7 @@ efi_status_t efi_allocate_pool(int pool_type, unsigned
> long size,
> r = efi_allocate_pages(0, pool_type, num_pages, &t);
>
> if (r == EFI_SUCCESS) {
> - struct efi_pool_allocation *alloc = (void *)(uintptr_t)t;
> + struct efi_pool_allocation *alloc = map_sysmem(t, size);
> alloc->num_pages = num_pages;
> *buffer = alloc->data;
> }
> @@ -460,18 +461,22 @@ int efi_memory_init(void)
>
> efi_add_known_memory();
>
> - /* Add U-Boot */
> - uboot_start = (gd->start_addr_sp - uboot_stack_size) & ~EFI_PAGE_MASK;
> - uboot_pages = (gd->ram_top - uboot_start) >> EFI_PAGE_SHIFT;
> - efi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA, false);
> -
> - /* Add Runtime Services */
> - runtime_start = (ulong)&__efi_runtime_start & ~EFI_PAGE_MASK;
> - runtime_end = (ulong)&__efi_runtime_stop;
> - runtime_end = (runtime_end + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;
> - runtime_pages = (runtime_end - runtime_start) >> EFI_PAGE_SHIFT;
> - efi_add_memory_map(runtime_start, runtime_pages,
> - EFI_RUNTIME_SERVICES_CODE, false);
> + if (!IS_ENABLED(CONFIG_SANDBOX)) {
> + /* Add U-Boot */
> + uboot_start = (gd->start_addr_sp - uboot_stack_size) &
> + ~EFI_PAGE_MASK;
> + uboot_pages = (gd->ram_top - uboot_start) >> EFI_PAGE_SHIFT;
> + efi_add_memory_map(uboot_start, uboot_pages, EFI_LOADER_DATA,
> + false);
> +
> + /* Add Runtime Services */
> + runtime_start = (ulong)&__efi_runtime_start & ~EFI_PAGE_MASK;
> + runtime_end = (ulong)&__efi_runtime_stop;
> + runtime_end = (runtime_end + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;
> + runtime_pages = (runtime_end - runtime_start) >> EFI_PAGE_SHIFT;
> + efi_add_memory_map(runtime_start, runtime_pages,
> + EFI_RUNTIME_SERVICES_CODE, false);
> + }
>
> #ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER
> /* Request a 32bit 64MB bounce buffer region */
>
bootefi selftest shows an error. You should setup the EFI memory for
CONFIG_SANDBOX=y too.
Setting up 'ExitBootServices'
Setting up 'ExitBootServices' succeeded
lib/efi_selftest/efi_selftest.c(53):
ERROR: GetMemoryMap did not return EFI_SUCCESS
Best regards
Heinrich
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
