mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-28 08:35:38 +00:00
2ec88086c9
Since commit 7b78d6438a ("efi_loader: Reserve unaccessible memory")
memory region above ram_top is tagged in EFI memory map as
EFI_BOOT_SERVICES_DATA.
In case of STM32MP1/STM32MP13 platforms, above ram_top, there is one
reserved-memory region tagged "no-map" dedicated to OP-TEE :
_ addr=de000000 size=2000000 for stm32mp157x-dkx and stm32mp135f-dk
_ addr=fe000000 size=2000000 for stm32mp157c-ev1
Before booting kernel, EFI memory map is first built, the OPTEE region is
tagged as EFI_BOOT_SERVICES_DATA and when reserving LMB, the tag LMB_NONE
is used.
Then after, the LMB are completed by boot_fdt_add_mem_rsv_regions()
which try to add again the same OPTEE region (addr=de000000 size=2000000
in case of stm32mp157x-dkx / stm32mp135f-dk or addr=fe000000 size=2000000
in case for stm2mp157c-ev1)
but now with LMB_NOMAP tag which produces the following error message :
_ for stm32mp157x-dkx / stm32mp135f-dk :
"ERROR: reserving fdt memory region failed (addr=de000000 size=2000000 flags=4)"
_ for stm32mp157c-ev1 :
"ERROR: reserving fdt memory region failed (addr=fe000000 size=2000000 flags=4)"
To avoid this, OPTEE area shouldn't be used by EFI, so we need to mark
it as reserved.
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
88 lines
2.1 KiB
C
88 lines
2.1 KiB
C
// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
|
|
/*
|
|
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved
|
|
*/
|
|
|
|
#define LOG_CATEGORY LOGC_ARCH
|
|
|
|
#include <dm.h>
|
|
#include <efi_loader.h>
|
|
#include <image.h>
|
|
#include <init.h>
|
|
#include <lmb.h>
|
|
#include <log.h>
|
|
#include <ram.h>
|
|
#include <asm/global_data.h>
|
|
#include <asm/system.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int dram_init(void)
|
|
{
|
|
struct ram_info ram;
|
|
struct udevice *dev;
|
|
int ret;
|
|
|
|
ret = uclass_get_device(UCLASS_RAM, 0, &dev);
|
|
/* in case there is no RAM driver, retrieve DDR size from DT */
|
|
if (ret == -ENODEV) {
|
|
return fdtdec_setup_mem_size_base();
|
|
} else if (ret) {
|
|
log_err("RAM init failed: %d\n", ret);
|
|
return ret;
|
|
}
|
|
ret = ram_get_info(dev, &ram);
|
|
if (ret) {
|
|
log_debug("Cannot get RAM size: %d\n", ret);
|
|
return ret;
|
|
}
|
|
log_debug("RAM init base=%p, size=%zx\n", (void *)ram.base, ram.size);
|
|
|
|
gd->ram_size = ram.size;
|
|
|
|
return 0;
|
|
}
|
|
|
|
phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
|
|
{
|
|
phys_size_t size;
|
|
phys_addr_t reg;
|
|
struct lmb lmb;
|
|
|
|
if (!total_size)
|
|
return gd->ram_top;
|
|
|
|
/*
|
|
* make sure U-Boot uses address space below 4GB boundaries even
|
|
* if the effective available memory is bigger
|
|
*/
|
|
gd->ram_top = clamp_val(gd->ram_top, 0, SZ_4G - 1);
|
|
|
|
/* found enough not-reserved memory to relocated U-Boot */
|
|
lmb_init(&lmb);
|
|
lmb_add(&lmb, gd->ram_base, gd->ram_top - gd->ram_base);
|
|
boot_fdt_add_mem_rsv_regions(&lmb, (void *)gd->fdt_blob);
|
|
/* add 8M for reserved memory for display, fdt, gd,... */
|
|
size = ALIGN(SZ_8M + CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE),
|
|
reg = lmb_alloc(&lmb, size, MMU_SECTION_SIZE);
|
|
|
|
if (!reg)
|
|
reg = gd->ram_top - size;
|
|
|
|
/* before relocation, mark the U-Boot memory as cacheable by default */
|
|
if (!(gd->flags & GD_FLG_RELOC))
|
|
mmu_set_region_dcache_behaviour(reg, size, DCACHE_DEFAULT_OPTION);
|
|
|
|
return reg + size;
|
|
}
|
|
|
|
void efi_add_known_memory(void)
|
|
{
|
|
if (IS_ENABLED(CONFIG_EFI_LOADER))
|
|
/*
|
|
* Memory over ram_top is reserved to OPTEE.
|
|
* Declare to EFI only memory area below ram_top
|
|
*/
|
|
efi_add_memory_map(gd->ram_base, gd->ram_top - gd->ram_base,
|
|
EFI_CONVENTIONAL_MEMORY);
|
|
}
|