Mirrors/opensbi
7
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-24 23:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: utils: Make sure that hartid and the scratch are aligned

Browse Source 
Harts associated with an ACLINT_MSWI need not have sequential hartids.
It is insufficient to use first_hartid and hart_count. To account for
non-sequential hart ids, include the empty hart-ids' generate hart-count.

Signed-off-by: Raj Vishwanathan <Raj.Vishwanathan@gmail.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Raj Vishwanathan
2025-02-25 14:57:52 -08:00
committed by Anup Patel
parent 949c83a799
commit 321ca8063b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/utils/fdt/fdt_helper.c
View File

@@ -962,7 +962,7 @@ int fdt_parse_aclint_node(const void *fdt, int nodeoffset,
{ {
const fdt32_t *val; const fdt32_t *val;
int i, rc, count, cpu_offset, cpu_intc_offset; int i, rc, count, cpu_offset, cpu_intc_offset;
u32 phandle, hwirq, hartid, first_hartid, last_hartid, hart_count; u32 phandle, hwirq, hartid, first_hartid, last_hartid;
u32 match_hwirq = (for_timer) ? IRQ_M_TIMER : IRQ_M_SOFT; u32 match_hwirq = (for_timer) ? IRQ_M_TIMER : IRQ_M_SOFT;
if (nodeoffset < 0 || !fdt || if (nodeoffset < 0 || !fdt ||
@@ -991,7 +991,7 @@ int fdt_parse_aclint_node(const void *fdt, int nodeoffset,
count = count / sizeof(fdt32_t); count = count / sizeof(fdt32_t);
first_hartid = -1U; first_hartid = -1U;
hart_count = last_hartid = 0; last_hartid = 0;
for (i = 0; i < (count / 2); i++) { for (i = 0; i < (count / 2); i++) {
phandle = fdt32_to_cpu(val[2 * i]); phandle = fdt32_to_cpu(val[2 * i]);
hwirq = fdt32_to_cpu(val[(2 * i) + 1]); hwirq = fdt32_to_cpu(val[(2 * i) + 1]);
@@ -1016,16 +1016,13 @@ int fdt_parse_aclint_node(const void *fdt, int nodeoffset,
first_hartid = hartid; first_hartid = hartid;
if (hartid > last_hartid) if (hartid > last_hartid)
last_hartid = hartid; last_hartid = hartid;
hart_count++;
} }
} }
if ((last_hartid >= first_hartid) && first_hartid != -1U) { if ((last_hartid >= first_hartid) && first_hartid != -1U) {
*out_first_hartid = first_hartid; *out_first_hartid = first_hartid;
count = last_hartid - first_hartid + 1; *out_hart_count = last_hartid - first_hartid + 1;
*out_hart_count = (hart_count < count) ? hart_count : count;
} }
return 0; return 0;
} }