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

lib: utils: Disable appropriate IMSIC DT nodes in fdt_fixups()

Browse Source 
We should disable IMSIC DT nodes in fdt_fixups() which are not
accessible to the next booting stage based on currently assigned
domain.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
This commit is contained in:
Anup Patel
2021-06-15 11:19:40 +05:30
committed by Anup Patel
parent 811da5c541
commit 7127aaaaf7
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/sbi_utils/fdt/fdt_fixup.h
View File

@@ -21,6 +21,18 @@
*/ */
void fdt_cpu_fixup(void *fdt); void fdt_cpu_fixup(void *fdt);
/**
* Fix up the IMSIC nodes in the device tree
*
* This routine disables IMSIC nodes which are not accessible to the next
* booting stage based on currently assigned domain.
*
* It is recommended that platform codes call this helper in their final_init()
*
* @param fdt: device tree blob
*/
void fdt_imsic_fixup(void *fdt);
/** /**
* Fix up the PLIC node in the device tree * Fix up the PLIC node in the device tree
* *
@@ -64,8 +76,9 @@ int fdt_reserved_memory_nomap_fixup(void *fdt);
* General device tree fix-up * General device tree fix-up
* *
* This routine do all required device tree fix-ups for a typical platform. * This routine do all required device tree fix-ups for a typical platform.
* It fixes up the PLIC node and the reserved memory node in the device tree * It fixes up the PLIC node, IMSIC nodes, and the reserved memory node in
* by calling the corresponding helper routines to accomplish the task. * the device tree by calling the corresponding helper routines to accomplish
* the task.
* *
* It is recommended that platform codes call this helper in their final_init() * It is recommended that platform codes call this helper in their final_init()
* *

32
lib/utils/fdt/fdt_fixup.c
View File

@@ -52,6 +52,34 @@ void fdt_cpu_fixup(void *fdt)
} }
} }
static void fdt_domain_based_fixup_one(void *fdt, int nodeoff)
{
int rc;
uint64_t reg_addr, reg_size;
struct sbi_domain *dom = sbi_domain_thishart_ptr();
rc = fdt_get_node_addr_size(fdt, nodeoff, 0, &reg_addr, &reg_size);
if (rc < 0 || !reg_addr || !reg_size)
return;
if (!sbi_domain_check_addr(dom, reg_addr, dom->next_mode,
SBI_DOMAIN_READ | SBI_DOMAIN_WRITE)) {
rc = fdt_open_into(fdt, fdt, fdt_totalsize(fdt) + 32);
if (rc < 0)
return;
fdt_setprop_string(fdt, nodeoff, "status", "disabled");
}
}
void fdt_imsic_fixup(void *fdt)
{
int noff = 0;
while ((noff = fdt_node_offset_by_compatible(fdt, noff,
"riscv,imsics")) >= 0)
fdt_domain_based_fixup_one(fdt, noff);
}
void fdt_plic_fixup(void *fdt) void fdt_plic_fixup(void *fdt)
{ {
u32 *cells; u32 *cells;
@@ -261,10 +289,10 @@ int fdt_reserved_memory_nomap_fixup(void *fdt)
void fdt_fixups(void *fdt) void fdt_fixups(void *fdt)
{ {
fdt_imsic_fixup(fdt);
fdt_plic_fixup(fdt); fdt_plic_fixup(fdt);
fdt_reserved_memory_fixup(fdt); fdt_reserved_memory_fixup(fdt);
fdt_pmu_fixup(fdt); fdt_pmu_fixup(fdt);
} }