diff options
| author | Jan Remes <jan.remes@codasip.com> | 2022-05-13 13:58:41 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2022-05-14 07:46:50 +0300 |
| commit | 616da52e186dfecb767ee7bd5913ef70028a422d (patch) | |
| tree | 1eb76d7d7e3e650d9aa700daac01528f0d5479df | |
| parent | 90a9dd2b22bb5441df85a23e4e4690bec14fa1e5 (diff) | |
| download | opensbi-616da52e186dfecb767ee7bd5913ef70028a422d.tar.xz | |
lib: utils: check if CPU node is enabled
Ignore CPU nodes in FDT that are not enabled.
Signed-off-by: Jan Remes <jan.remes@codasip.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
| -rw-r--r-- | lib/utils/fdt/fdt_domain.c | 14 | ||||
| -rw-r--r-- | lib/utils/fdt/fdt_fixup.c | 3 | ||||
| -rw-r--r-- | lib/utils/fdt/fdt_helper.c | 3 |
3 files changed, 19 insertions, 1 deletions
diff --git a/lib/utils/fdt/fdt_domain.c b/lib/utils/fdt/fdt_domain.c index 676c757..bd0eec3 100644 --- a/lib/utils/fdt/fdt_domain.c +++ b/lib/utils/fdt/fdt_domain.c @@ -165,6 +165,9 @@ void fdt_domain_fixup(void *fdt) if (err) continue; + if (!fdt_node_is_enabled(fdt, doffset)) + continue; + fdt_nop_property(fdt, doffset, "opensbi-domain"); } @@ -308,6 +311,9 @@ static int __fdt_parse_domain(void *fdt, int domain_offset, void *opaque) if (err) return err; + if (!fdt_node_is_enabled(fdt, cpu_offset)) + continue; + sbi_hartmask_set_hart(val32, mask); } } @@ -347,7 +353,7 @@ static int __fdt_parse_domain(void *fdt, int domain_offset, void *opaque) if (val && len >= 4) { cpu_offset = fdt_node_offset_by_phandle(fdt, fdt32_to_cpu(*val)); - if (cpu_offset >= 0) + if (cpu_offset >= 0 && fdt_node_is_enabled(fdt, cpu_offset)) fdt_parse_hart_id(fdt, cpu_offset, &val32); } else { if (domain_offset == *cold_domain_offset) @@ -414,6 +420,9 @@ static int __fdt_parse_domain(void *fdt, int domain_offset, void *opaque) if (SBI_HARTMASK_MAX_BITS <= val32) continue; + if (!fdt_node_is_enabled(fdt, cpu_offset)) + continue; + val = fdt_getprop(fdt, cpu_offset, "opensbi-domain", &len); if (!val || len < 4) return SBI_EINVAL; @@ -460,6 +469,9 @@ int fdt_domains_populate(void *fdt) if (hartid != cold_hartid) continue; + if (!fdt_node_is_enabled(fdt, cpu_offset)) + continue; + val = fdt_getprop(fdt, cpu_offset, "opensbi-domain", &len); if (val && len >= 4) cold_domain_offset = fdt_node_offset_by_phandle(fdt, diff --git a/lib/utils/fdt/fdt_fixup.c b/lib/utils/fdt/fdt_fixup.c index a80bd82..d1050bb 100644 --- a/lib/utils/fdt/fdt_fixup.c +++ b/lib/utils/fdt/fdt_fixup.c @@ -38,6 +38,9 @@ void fdt_cpu_fixup(void *fdt) if (err) continue; + if (!fdt_node_is_enabled(fdt, cpu_offset)) + continue; + /* * Disable a HART DT node if one of the following is true: * 1. The HART is not assigned to the current domain diff --git a/lib/utils/fdt/fdt_helper.c b/lib/utils/fdt/fdt_helper.c index 3b45ae8..5db3fbe 100644 --- a/lib/utils/fdt/fdt_helper.c +++ b/lib/utils/fdt/fdt_helper.c @@ -283,6 +283,9 @@ int fdt_parse_max_hart_id(void *fdt, u32 *max_hartid) if (err) continue; + if (!fdt_node_is_enabled(fdt, cpu_offset)) + continue; + if (hartid > *max_hartid) *max_hartid = hartid; } |