From 7127aaaaf709c0a5a08b70e993a135b27eb50006 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Tue, 15 Jun 2021 11:19:40 +0530 Subject: lib: utils: Disable appropriate IMSIC DT nodes in fdt_fixups() 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 Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- lib/utils/fdt/fdt_fixup.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/utils/fdt/fdt_fixup.c b/lib/utils/fdt/fdt_fixup.c index ac01ba3d..c2460b8d 100644 --- a/lib/utils/fdt/fdt_fixup.c +++ b/lib/utils/fdt/fdt_fixup.c @@ -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, ®_addr, ®_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) { u32 *cells; @@ -261,10 +289,10 @@ int fdt_reserved_memory_nomap_fixup(void *fdt) void fdt_fixups(void *fdt) { + fdt_imsic_fixup(fdt); + fdt_plic_fixup(fdt); fdt_reserved_memory_fixup(fdt); fdt_pmu_fixup(fdt); } - - -- cgit v1.3.1