From 757f7acafdd25e0ff71a444bbe9f670bc33a3b7f Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Thu, 20 Feb 2025 10:42:29 -0800 Subject: lib: sbi_scratch: Add sbi_hart_count() and for_each_hartindex() There is currently no helper for iterating through the harts in a system, and code must choose between sbi_scratch_last_hartindex() and sbi_platform_hart_count() for the loop condition. sbi_scratch_last_hartindex() has unusual semantics, leading to the likelihood of off-by-one errors, and sbi_platform_hart_count() is provided by the platform and so may not be properly bounded. Add a new helper which definitively reports the number of harts managed by this OpenSBI instance, i.e. the number of valid hart indexes, and a convenient iterator macro. Signed-off-by: Samuel Holland Reviewed-by: Anup Patel --- include/sbi/sbi_scratch.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/sbi/sbi_scratch.h b/include/sbi/sbi_scratch.h index 1ec1710e..293625f1 100644 --- a/include/sbi/sbi_scratch.h +++ b/include/sbi/sbi_scratch.h @@ -210,15 +210,21 @@ do { \ #define current_hartindex() \ (sbi_scratch_thishart_ptr()->hartindex) -/** Last HART index having a sbi_scratch pointer */ -extern u32 last_hartindex_having_scratch; +/** Number of harts managed by this OpenSBI instance */ +extern u32 sbi_scratch_hart_count; + +/** Get the number of harts managed by this OpenSBI instance */ +#define sbi_hart_count() sbi_scratch_hart_count + +/** Iterate over the harts managed by this OpenSBI instance */ +#define sbi_for_each_hartindex(__var) \ + for (u32 __var = 0; __var < sbi_hart_count(); ++__var) /** Get last HART index having a sbi_scratch pointer */ -#define sbi_scratch_last_hartindex() last_hartindex_having_scratch +#define sbi_scratch_last_hartindex() (sbi_hart_count() - 1) /** Check whether a particular HART index is valid or not */ -#define sbi_hartindex_valid(__hartindex) \ -(((__hartindex) <= sbi_scratch_last_hartindex()) ? true : false) +#define sbi_hartindex_valid(__hartindex) ((__hartindex) < sbi_hart_count()) /** HART index to HART id table */ extern u32 hartindex_to_hartid_table[]; -- cgit v1.2.3