Skip to contentSkip to conversation

lib: sbi: Use mask to check the free bit during trigger allocation

PATCH New Himanshu Chauhan 2 participants 2 messages Jan 2, 2024 – Feb 5, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib: sbi: Use mask to check the free bit during trigger allocation

The trigger allocation function uses bit shift instead of mask to check the mapped status of the triggers. This causes index 0 to be return always. As a result, the older triggers are overwritten.

Use the mask for MAPPED field in state word to check if the trigger is mapped.

Fixes 97f234f15 ("lib: sbi: Introduce the SBI debug triggers extension support")
---
 lib/sbi/sbi_dbtr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/sbi/sbi_dbtr.c +1 -1
index 019e702..7142fed 100644
@@ -129,7 +129,7 @@ static inline struct sbi_dbtr_trigger *sbi_alloc_trigger(void)
 
 	for (i = 0; i < hart_state->total_trigs; i++) {
 		f_trig = INDEX_TO_TRIGGER(i);
-		if (f_trig->state & RV_DBTR_BIT(TS, MAPPED))
+		if (f_trig->state & RV_DBTR_BIT_MASK(TS, MAPPED))
 			continue;
 		hart_state->available_trigs--;
 		break;
Signature · 1 line
2.42.0
Applied
#1 lore raw

PATCH 1/1 lib: sbi: Use mask to check the free bit during trigger allocation

Quoted 9 lines · On Wed, Jan 17, 2024 at 10:33?AM Himanshu Chauhan <[email protected]>…

The trigger allocation function uses bit shift instead of mask to check the mapped status of the triggers. This causes index 0 to be return always. As a result, the older triggers are overwritten.

Use the mask for MAPPED field in state word to check if the trigger is mapped.

Fixes 97f234f15 ("lib: sbi: Introduce the SBI debug triggers extension support")

LGTM.

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

Quoted 25 lines
---
 lib/sbi/sbi_dbtr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/sbi/sbi_dbtr.c +1 -2
index 019e702..7142fed 100644
@@ -129,7 +129,7 @@ static inline struct sbi_dbtr_trigger *sbi_alloc_trigger(void)
 
        for (i = 0; i < hart_state->total_trigs; i++) {
                f_trig = INDEX_TO_TRIGGER(i);
-               if (f_trig->state & RV_DBTR_BIT(TS, MAPPED))
+               if (f_trig->state & RV_DBTR_BIT_MASK(TS, MAPPED))
                        continue;
                hart_state->available_trigs--;
                break;
--

2.42.0

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