Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils/fdt: Add fdt_get_address_rw() helper

Browse Source 
Help tracking the lifecycle of the FDT blob by indicating which parts of
the firmware modify it, and thus invalidate any previously-obtained
offsets or pointers to data inside the blob.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Samuel Holland
2024-07-30 21:58:57 -07:00
committed by Anup Patel
parent c36801841e
commit 8cb7f89d7c
6 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/sbi_utils/fdt/fdt_helper.h
View File

@@ -114,7 +114,12 @@ int fdt_parse_plicsw_node(const void *fdt, int nodeoffset, unsigned long *plicsw
int fdt_parse_compat_addr(const void *fdt, uint64_t *addr, int fdt_parse_compat_addr(const void *fdt, uint64_t *addr,
const char *compatible); const char *compatible);
static inline void *fdt_get_address(void) static inline const void *fdt_get_address(void)
{
return (const void *)root.next_arg1;
}
static inline void *fdt_get_address_rw(void)
{ {
return (void *)root.next_arg1; return (void *)root.next_arg1;
} }

2
platform/fpga/ariane/platform.c
View File

@@ -87,7 +87,7 @@ static int ariane_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = fdt_get_address(); fdt = fdt_get_address_rw();
fdt_fixups(fdt); fdt_fixups(fdt);
return 0; return 0;

4
platform/fpga/openpiton/platform.c
View File

@@ -70,7 +70,7 @@ static struct aclint_mtimer_data mtimer = {
*/ */
static int openpiton_early_init(bool cold_boot) static int openpiton_early_init(bool cold_boot)
{ {
void *fdt; const void *fdt;
struct platform_uart_data uart_data = { 0 }; struct platform_uart_data uart_data = { 0 };
struct plic_data plic_data; struct plic_data plic_data;
unsigned long aclint_freq; unsigned long aclint_freq;
@@ -118,7 +118,7 @@ static int openpiton_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = fdt_get_address(); fdt = fdt_get_address_rw();
fdt_fixups(fdt); fdt_fixups(fdt);
return 0; return 0;

4
platform/generic/platform.c
View File

@@ -243,7 +243,7 @@ static int generic_early_init(bool cold_boot)
static int generic_final_init(bool cold_boot) static int generic_final_init(bool cold_boot)
{ {
void *fdt = fdt_get_address(); void *fdt = fdt_get_address_rw();
int rc; int rc;
if (generic_plat && generic_plat->final_init) { if (generic_plat && generic_plat->final_init) {
@@ -314,7 +314,7 @@ static int generic_extensions_init(struct sbi_hart_features *hfeatures)
static int generic_domains_init(void) static int generic_domains_init(void)
{ {
void *fdt = fdt_get_address(); const void *fdt = fdt_get_address();
int offset, ret; int offset, ret;
ret = fdt_domains_populate(fdt); ret = fdt_domains_populate(fdt);

2
platform/kendryte/k210/platform.c
View File

@@ -124,7 +124,7 @@ static int k210_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = fdt_get_address(); fdt = fdt_get_address_rw();
fdt_cpu_fixup(fdt); fdt_cpu_fixup(fdt);
fdt_fixups(fdt); fdt_fixups(fdt);

2
platform/nuclei/ux600/platform.c
View File

@@ -181,7 +181,7 @@ static int ux600_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = fdt_get_address(); fdt = fdt_get_address_rw();
ux600_modify_dt(fdt); ux600_modify_dt(fdt);
return 0; return 0;