mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-15 01:17:39 +00:00
ccaa5747bd
Add boolean input argument @no_map to helper function fdtdec_add_reserved_memory() to add or not "no-map" property for an added reserved memory node. Property no-map is used by the Linux kernel to not not map memory in its static memory mapping. It is needed for example for the| consistency of system non-cached memory and to prevent speculative accesses to some firewalled memory. No functional change. A later change will update to OPTEE library to add no-map property to OP-TEE reserved memory nodes. Signed-off-by: Etienne Carriere <etienne.carriere@st.com> Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Reviewed-by: Simon Glass <sjg@chromium.org>
169 lines
4.1 KiB
C
169 lines
4.1 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2020 Western Digital Corporation or its affiliates
|
|
*
|
|
*/
|
|
|
|
#define LOG_CATEGORY LOGC_ARCH
|
|
|
|
#include <common.h>
|
|
#include <fdt_support.h>
|
|
#include <log.h>
|
|
#include <mapmem.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
/**
|
|
* riscv_fdt_copy_resv_mem_node() - Copy reserve memory node entry
|
|
* @src: Pointer to the source device tree from which reserved memory node
|
|
* needs to be copied.
|
|
* @dst: Pointer to the destination device tree to which reserved memory node
|
|
* needs to be copied.
|
|
*
|
|
* Return: 0 on success or if source doesn't have reserved memory node.
|
|
* Error if copy process failed.
|
|
*/
|
|
int riscv_fdt_copy_resv_mem_node(const void *src, void *dst)
|
|
{
|
|
u32 phandle;
|
|
struct fdt_memory pmp_mem;
|
|
fdt_addr_t addr;
|
|
fdt_size_t size;
|
|
int offset, node, err, rmem_offset;
|
|
bool nomap = true;
|
|
char basename[32] = {0};
|
|
int bname_len;
|
|
int max_len = sizeof(basename);
|
|
const char *name;
|
|
char *temp;
|
|
|
|
offset = fdt_path_offset(src, "/reserved-memory");
|
|
if (offset < 0) {
|
|
log_debug("No reserved memory region found in source FDT\n");
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Extend the FDT by the following estimated size:
|
|
*
|
|
* Each PMP memory region entry occupies 64 bytes.
|
|
* With 16 PMP memory regions we need 64 * 16 = 1024 bytes.
|
|
*/
|
|
err = fdt_open_into(dst, dst, fdt_totalsize(dst) + 1024);
|
|
if (err < 0) {
|
|
printf("Device Tree can't be expanded to accommodate new node");
|
|
return err;
|
|
}
|
|
|
|
fdt_for_each_subnode(node, src, offset) {
|
|
name = fdt_get_name(src, node, NULL);
|
|
|
|
addr = fdtdec_get_addr_size_auto_parent(src, offset, node,
|
|
"reg", 0, &size,
|
|
false);
|
|
if (addr == FDT_ADDR_T_NONE) {
|
|
log_debug("failed to read address/size for %s\n", name);
|
|
continue;
|
|
}
|
|
strncpy(basename, name, max_len);
|
|
temp = strchr(basename, '@');
|
|
if (temp) {
|
|
bname_len = strnlen(basename, max_len) - strnlen(temp,
|
|
max_len);
|
|
*(basename + bname_len) = '\0';
|
|
}
|
|
pmp_mem.start = addr;
|
|
pmp_mem.end = addr + size - 1;
|
|
err = fdtdec_add_reserved_memory(dst, basename, &pmp_mem,
|
|
&phandle, false);
|
|
if (err < 0 && err != -FDT_ERR_EXISTS) {
|
|
log_err("failed to add reserved memory: %d\n", err);
|
|
return err;
|
|
}
|
|
if (!fdt_getprop(src, node, "no-map", NULL))
|
|
nomap = false;
|
|
if (nomap) {
|
|
rmem_offset = fdt_node_offset_by_phandle(dst, phandle);
|
|
fdt_setprop_empty(dst, rmem_offset, "no-map");
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* riscv_board_reserved_mem_fixup() - Fix up reserved memory node for a board
|
|
* @fdt: Pointer to the device tree in which reserved memory node needs to be
|
|
* added.
|
|
*
|
|
* In RISC-V, any board needs to copy the reserved memory node from the device
|
|
* tree provided by the firmware to the device tree used by U-Boot. This is a
|
|
* common function that individual board fixup functions can invoke.
|
|
*
|
|
* Return: 0 on success or error otherwise.
|
|
*/
|
|
int riscv_board_reserved_mem_fixup(void *fdt)
|
|
{
|
|
int err;
|
|
void *src_fdt_addr;
|
|
|
|
src_fdt_addr = map_sysmem(gd->arch.firmware_fdt_addr, 0);
|
|
|
|
/* avoid the copy if we are using the same device tree */
|
|
if (src_fdt_addr == fdt)
|
|
return 0;
|
|
|
|
err = riscv_fdt_copy_resv_mem_node(src_fdt_addr, fdt);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_OF_BOARD_FIXUP
|
|
int board_fix_fdt(void *fdt)
|
|
{
|
|
int err;
|
|
|
|
err = riscv_board_reserved_mem_fixup(fdt);
|
|
if (err < 0) {
|
|
log_err("failed to fixup DT for reserved memory: %d\n", err);
|
|
return err;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
int arch_fixup_fdt(void *blob)
|
|
{
|
|
int err;
|
|
#ifdef CONFIG_EFI_LOADER
|
|
u32 size;
|
|
int chosen_offset;
|
|
|
|
size = fdt_totalsize(blob);
|
|
err = fdt_open_into(blob, blob, size + 32);
|
|
if (err < 0) {
|
|
log_err("Device Tree can't be expanded to accommodate new node");
|
|
return err;
|
|
}
|
|
chosen_offset = fdt_path_offset(blob, "/chosen");
|
|
if (chosen_offset < 0) {
|
|
err = fdt_add_subnode(blob, 0, "chosen");
|
|
if (err < 0) {
|
|
log_err("chosen node cannot be added\n");
|
|
return err;
|
|
}
|
|
}
|
|
/* Overwrite the boot-hartid as U-Boot is the last stage BL */
|
|
fdt_setprop_u32(blob, chosen_offset, "boot-hartid", gd->arch.boot_hart);
|
|
#endif
|
|
|
|
/* Copy the reserved-memory node to the DT used by OS */
|
|
err = riscv_fdt_copy_resv_mem_node(gd->fdt_blob, blob);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
return 0;
|
|
}
|