[PATCH] lib: utils: Fix fdt_parse_aclint_node() for non-contiguous hartid

[PATCH] lib: utils: Fix fdt_parse_aclint_node() for non-contiguous hartid

[Anup Patel]

Currently, the fdt_parse_aclint_node() does not handle non-contiguous
hartid correctly and returns incorrect first_hartid and hart_count.
This is because the for-loop in fdt_parse_aclint_node() skips a hartid
for which hartindex is not available (aka corresponding CPU DT node
is disabled).

For example, on a platform with 4 HARTs (hartid 0, 1, 2, and 3) where
CPU DT nodes with hartid 0 and 2 are disabled, the fdt_parse_aclint_node()
returns first_hartid = 1 and hart_count = 3 which is incorrect.

To address the above issue, drop the sbi_hartid_to_hartindex() check
from the for-loop of fdt_parse_aclint_node().

Fixes: 5e90e54a1a53 ("lib: utils:Check that hartid is valid")
Reported-by: Maria Mbaye <MameMaria.Mbaye@microchip.com>
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
---
 lib/utils/fdt/fdt_helper.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/utils/fdt/fdt_helper.c b/lib/utils/fdt/fdt_helper.c
index b2d91fdf..4c0e8221 100644
--- a/lib/utils/fdt/fdt_helper.c
+++ b/lib/utils/fdt/fdt_helper.c
@@ -1013,9 +1013,6 @@ int fdt_parse_aclint_node(const void *fdt, int nodeoffset,
 		if (rc)
 			continue;
 
-		if (SBI_HARTMASK_MAX_BITS <= sbi_hartid_to_hartindex(hartid))
-			continue;
-
 		if (match_hwirq == hwirq) {
 			if (hartid < first_hartid)
 				first_hartid = hartid;
-- 
2.43.0


-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi

Re: [PATCH] lib: utils: Fix fdt_parse_aclint_node() for non-contiguous hartid

[Anup Patel]

On Fri, Jun 6, 2025 at 11:28 AM Anup Patel <apatel@ventanamicro.com> wrote:
>
> Currently, the fdt_parse_aclint_node() does not handle non-contiguous
> hartid correctly and returns incorrect first_hartid and hart_count.
> This is because the for-loop in fdt_parse_aclint_node() skips a hartid
> for which hartindex is not available (aka corresponding CPU DT node
> is disabled).
>
> For example, on a platform with 4 HARTs (hartid 0, 1, 2, and 3) where
> CPU DT nodes with hartid 0 and 2 are disabled, the fdt_parse_aclint_node()
> returns first_hartid = 1 and hart_count = 3 which is incorrect.
>
> To address the above issue, drop the sbi_hartid_to_hartindex() check
> from the for-loop of fdt_parse_aclint_node().
>
> Fixes: 5e90e54a1a53 ("lib: utils:Check that hartid is valid")
> Reported-by: Maria Mbaye <MameMaria.Mbaye@microchip.com>
> Signed-off-by: Anup Patel <apatel@ventanamicro.com>

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

> ---
>  lib/utils/fdt/fdt_helper.c | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/lib/utils/fdt/fdt_helper.c b/lib/utils/fdt/fdt_helper.c
> index b2d91fdf..4c0e8221 100644
> --- a/lib/utils/fdt/fdt_helper.c
> +++ b/lib/utils/fdt/fdt_helper.c
> @@ -1013,9 +1013,6 @@ int fdt_parse_aclint_node(const void *fdt, int nodeoffset,
>                 if (rc)
>                         continue;
>
> -               if (SBI_HARTMASK_MAX_BITS <= sbi_hartid_to_hartindex(hartid))
> -                       continue;
> -
>                 if (match_hwirq == hwirq) {
>                         if (hartid < first_hartid)
>                                 first_hartid = hartid;
> --
> 2.43.0
>

-- 
opensbi mailing list
opensbi@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi