sbi/sbi_pmu.c: Align the event type offset as per SBI specification
PATCH 1/1 sbi/sbi_pmu.c: Align the event type offset as per SBI specification
The bits encoded in event_idx[19:16] indicate the event type, with an offset of 16 instead of 20.
--- include/sbi/sbi_ecall_interface.h | 4 ++-- lib/sbi/sbi_pmu.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-)
include/sbi/sbi_ecall_interface.h +2 -2
@@ -214,10 +214,10 @@ enum sbi_pmu_ctr_type { };/* Helper macros to decode event idx */ -#define SBI_PMU_EVENT_IDX_OFFSET 20#define SBI_PMU_EVENT_IDX_MASK 0xFFFFF +#define SBI_PMU_EVENT_IDX_TYPE_OFFSET 16 +#define SBI_PMU_EVENT_IDX_TYPE_MASK (0xF << SBI_PMU_EVENT_IDX_TYPE_OFFSET)#define SBI_PMU_EVENT_IDX_CODE_MASK 0xFFFF -#define SBI_PMU_EVENT_IDX_TYPE_MASK 0xF0000#define SBI_PMU_EVENT_RAW_IDX 0x20000#define SBI_PMU_EVENT_IDX_INVALID 0xFFFFFFFF
lib/sbi/sbi_pmu.c +4 -3
@@ -81,7 +81,8 @@ static uint32_t num_hw_ctrs;static uint32_t total_ctrs;/* Helper macros to retrieve event idx and code type */ -#define get_cidx_type (x) ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> 16) +#define get_cidx_type (x) \ + ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> SBI_PMU_EVENT_IDX_TYPE_OFFSET)#define get_cidx_code (x) (x & SBI_PMU_EVENT_IDX_CODE_MASK)/**
@@ -903,10 +904,10 @@ int sbi_pmu_init(struct sbi_scratch *scratch, bool cold_boot)pmu_reset_event_map (hartid);/* First three counters are fixed by the priv spec and we enable it by default */ - active_events[hartid][0 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_OFFSET | + active_events[hartid][0 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_TYPE_OFFSET |SBI_PMU_HW_CPU_CYCLES ; active_events[hartid][1 ] =SBI_PMU_EVENT_IDX_INVALID ; - active_events[hartid][2 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_OFFSET | + active_events[hartid][2 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_TYPE_OFFSET |SBI_PMU_HW_INSTRUCTIONS ;return 0 ;
Signature · 1 line
2.34.1
PATCH 1/1 sbi/sbi_pmu.c: Align the event type offset as per SBI specification
Quoted 56 lines · Yu Chien Peter Lin
The bits encoded in event_idx[19:16] indicate the event type, with an offset of 16 instead of 20.
Signed-off-by Yu Chien Peter Lin <[email protected]>--- include/sbi/sbi_ecall_interface.h | 4 ++-- lib/sbi/sbi_pmu.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-)include/sbi/sbi_ecall_interface.h +2
-2@@ -214,10 +214,10 @@ enum sbi_pmu_ctr_type { };/* Helper macros to decode event idx */ -#define SBI_PMU_EVENT_IDX_OFFSET 20#define SBI_PMU_EVENT_IDX_MASK 0xFFFFF +#define SBI_PMU_EVENT_IDX_TYPE_OFFSET 16 +#define SBI_PMU_EVENT_IDX_TYPE_MASK (0xF << SBI_PMU_EVENT_IDX_TYPE_OFFSET)#define SBI_PMU_EVENT_IDX_CODE_MASK 0xFFFF -#define SBI_PMU_EVENT_IDX_TYPE_MASK 0xF0000#define SBI_PMU_EVENT_RAW_IDX 0x20000#define SBI_PMU_EVENT_IDX_INVALID 0xFFFFFFFFlib/sbi/sbi_pmu.c +4
-3@@ -81,7 +81,8 @@ static uint32_t num_hw_ctrs;static uint32_t total_ctrs;/* Helper macros to retrieve event idx and code type */ -#define get_cidx_type (x) ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> 16) +#define get_cidx_type (x) \ + ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> SBI_PMU_EVENT_IDX_TYPE_OFFSET)#define get_cidx_code (x) (x & SBI_PMU_EVENT_IDX_CODE_MASK)/** @@ -903,10 +904,10 @@ int sbi_pmu_init(struct sbi_scratch *scratch, bool cold_boot)pmu_reset_event_map (hartid);/* First three counters are fixed by the priv spec and we enable it by default */ - active_events[hartid][0 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_OFFSET | + active_events[hartid][0 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_TYPE_OFFSET |SBI_PMU_HW_CPU_CYCLES ; active_events[hartid][1 ] =SBI_PMU_EVENT_IDX_INVALID ; - active_events[hartid][2 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_OFFSET | + active_events[hartid][2 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_TYPE_OFFSET |SBI_PMU_HW_INSTRUCTIONS ;return 0 ;Signature · 1 line
2.34.1
I guess this was found by inspection, since SBI_PMU_EVENT_TYPE_HW is zero, so the patch doesn't change anything. And, even though nothing is changed, it is still a fix, so probably worth adding
Either way,
Thanks,
drew
PATCH 1/1 sbi/sbi_pmu.c: Align the event type offset as per SBI specification
Quoted 53 lines · Andrew Jones
Quoted 52 lines · Yu Chien Peter Lin
The bits encoded in event_idx[19:16] indicate the event type, with an offset of 16 instead of 20.
Signed-off-by Yu Chien Peter Lin <[email protected]>--- include/sbi/sbi_ecall_interface.h | 4 ++-- lib/sbi/sbi_pmu.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-)include/sbi/sbi_ecall_interface.h +2
-2@@ -214,10 +214,10 @@ enum sbi_pmu_ctr_type { };/* Helper macros to decode event idx */ -#define SBI_PMU_EVENT_IDX_OFFSET 20#define SBI_PMU_EVENT_IDX_MASK 0xFFFFF +#define SBI_PMU_EVENT_IDX_TYPE_OFFSET 16 +#define SBI_PMU_EVENT_IDX_TYPE_MASK (0xF << SBI_PMU_EVENT_IDX_TYPE_OFFSET)#define SBI_PMU_EVENT_IDX_CODE_MASK 0xFFFF -#define SBI_PMU_EVENT_IDX_TYPE_MASK 0xF0000#define SBI_PMU_EVENT_RAW_IDX 0x20000#define SBI_PMU_EVENT_IDX_INVALID 0xFFFFFFFFlib/sbi/sbi_pmu.c +4
-3@@ -81,7 +81,8 @@ static uint32_t num_hw_ctrs;static uint32_t total_ctrs;/* Helper macros to retrieve event idx and code type */ -#define get_cidx_type (x) ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> 16) +#define get_cidx_type (x) \ + ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> SBI_PMU_EVENT_IDX_TYPE_OFFSET)#define get_cidx_code (x) (x & SBI_PMU_EVENT_IDX_CODE_MASK)/** @@ -903,10 +904,10 @@ int sbi_pmu_init(struct sbi_scratch *scratch, bool cold_boot)pmu_reset_event_map (hartid);/* First three counters are fixed by the priv spec and we enable it by default */ - active_events[hartid][0 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_OFFSET | + active_events[hartid][0 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_TYPE_OFFSET |SBI_PMU_HW_CPU_CYCLES ; active_events[hartid][1 ] =SBI_PMU_EVENT_IDX_INVALID ; - active_events[hartid][2 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_OFFSET | + active_events[hartid][2 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_TYPE_OFFSET |SBI_PMU_HW_INSTRUCTIONS ;
Quoted 8 lines
Quoted 4 lines
lib/sbi/sbi_pmu.c +0
-0return 0 ;Signature · 1 line
2.34.1I guess this was found by inspection, since
SBI_PMU_EVENT_TYPE_HWis zero, so the patch doesn't change anything. And, even though nothing is changed, it is still a fix, so probably worth adding
Yes, the active_events was still filled with correct values.
Quoted 5 lines
Fixes 13d40f21d588 ("lib: sbi: Add PMU support")Either way,
Reviewed-by Andrew Jones <[email protected]>
Thanks for the review!
Regards,
Peter Lin
Quoted 3 lines
Thanks,
drew
PATCH 1/1 sbi/sbi_pmu.c: Align the event type offset as per SBI specification
In reply to Yu Chien Peter Lin? 2023-03-30???? 16:41 +0800?Yu Chien Peter Lin???
Quoted 4 lines
The bits encoded in event_idx[19:16] indicate the event type, with an offset of 16 instead of 20.
Signed-off-by Yu Chien Peter Lin <[email protected]>
LGTM
Quoted 53 lines
---
?include/sbi/sbi_ecall_interface.h | 4 ++--
?lib/sbi/sbi_pmu.c???????????????? | 7 ++++---
?2 files changed, 6 insertions(+), 5 deletions(-)include/sbi/sbi_ecall_interface.h +0
-0@@ -214,10 +214,10 @@ enum sbi_pmu_ctr_type { ?};?
?/* Helper macros to decode event idx */
-#defineSBI_PMU_EVENT_IDX_OFFSET20
?#defineSBI_PMU_EVENT_IDX_MASK0xFFFFFinclude/sbi/sbi_ecall_interface.h +2
-0+#define SBI_PMU_EVENT_IDX_TYPE_OFFSET 16 +#define SBI_PMU_EVENT_IDX_TYPE_MASK (0xF << SBI_PMU_EVENT_IDX_TYPE_OFFSET)?#define
SBI_PMU_EVENT_IDX_CODE_MASK0xFFFF
-#defineSBI_PMU_EVENT_IDX_TYPE_MASK0xF0000
?#defineSBI_PMU_EVENT_RAW_IDX0x20000
?
?#defineSBI_PMU_EVENT_IDX_INVALID0xFFFFFFFFlib/sbi/sbi_pmu.c +0
-0@@ -81,7 +81,8 @@ static uint32_t num_hw_ctrs; ?static uint32_t total_ctrs;?
?/* Helper macros to retrieve event idx and code type */lib/sbi/sbi_pmu.c +2
-1-#define get_cidx_type (x) ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> 16) +#define get_cidx_type (x) \ +? ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> SBI_PMU_EVENT_IDX_TYPE_OFFSET)?#define
get_cidx_code(x)(x &SBI_PMU_EVENT_IDX_CODE_MASK) ?
?/**lib/sbi/sbi_pmu.c +0
-0@@ -903,10 +904,10 @@ int sbi_pmu_init(struct sbi_scratch *scratch, bool cold_boot) ????????pmu_reset_event_map(hartid);?
????????/* First three counters are fixed by the priv spec and we enable it by default */ -???????active_events[hartid][0] =SBI_PMU_EVENT_TYPE_HW<<SBI_PMU_EVENT_IDX_OFFSET| +???????active_events[hartid][0] =SBI_PMU_EVENT_TYPE_HW<<SBI_PMU_EVENT_IDX_TYPE_OFFSET| ??????????????????????????????????SBI_PMU_HW_CPU_CYCLES; ????????active_events[hartid][1] =SBI_PMU_EVENT_IDX_INVALID; -???????active_events[hartid][2] =SBI_PMU_EVENT_TYPE_HW<<SBI_PMU_EVENT_IDX_OFFSET| +???????active_events[hartid][2] =SBI_PMU_EVENT_TYPE_HW<<SBI_PMU_EVENT_IDX_TYPE_OFFSET| ??????????????????????????????????SBI_PMU_HW_INSTRUCTIONS;
?
????????return 0;Signature · 1 line
2.34.1
Anup Patel
AppliedPATCH 1/1 sbi/sbi_pmu.c: Align the event type offset as per SBI specification
In reply to Yu Chien Peter LinQuoted 5 lines · On Thu, Mar 30, 2023 at 2:11?PM Yu Chien Peter Lin <[email protected]>…
The bits encoded in event_idx[19:16] indicate the event type, with an offset of 16 instead of 20.
Signed-off-by Yu Chien Peter Lin <[email protected]>
I have updated the commit description to have a Fixes tag and use "lib: sbi_pmu:" as the subject prefix.
Applied this patch to the riscv/opensbi repo.
Thanks,
Anup
Quoted 57 lines
--- include/sbi/sbi_ecall_interface.h | 4 ++-- lib/sbi/sbi_pmu.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-)include/sbi/sbi_ecall_interface.h +2
-2@@ -214,10 +214,10 @@ enum sbi_pmu_ctr_type { };/* Helper macros to decode event idx */ -#define SBI_PMU_EVENT_IDX_OFFSET 20#define SBI_PMU_EVENT_IDX_MASK 0xFFFFF +#define SBI_PMU_EVENT_IDX_TYPE_OFFSET 16 +#define SBI_PMU_EVENT_IDX_TYPE_MASK (0xF << SBI_PMU_EVENT_IDX_TYPE_OFFSET)#define SBI_PMU_EVENT_IDX_CODE_MASK 0xFFFF -#define SBI_PMU_EVENT_IDX_TYPE_MASK 0xF0000#define SBI_PMU_EVENT_RAW_IDX 0x20000#define SBI_PMU_EVENT_IDX_INVALID 0xFFFFFFFFlib/sbi/sbi_pmu.c +4
-4@@ -81,7 +81,8 @@ static uint32_t num_hw_ctrs;static uint32_t total_ctrs;/* Helper macros to retrieve event idx and code type */ -#define get_cidx_type (x) ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> 16) +#define get_cidx_type (x) \ + ((x & SBI_PMU_EVENT_IDX_TYPE_MASK) >> SBI_PMU_EVENT_IDX_TYPE_OFFSET)#define get_cidx_code (x) (x & SBI_PMU_EVENT_IDX_CODE_MASK)/** @@ -903,10 +904,10 @@ int sbi_pmu_init(struct sbi_scratch *scratch, bool cold_boot)pmu_reset_event_map (hartid);/* First three counters are fixed by the priv spec and we enable it by default */ - active_events[hartid][0 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_OFFSET | + active_events[hartid][0 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_TYPE_OFFSET |SBI_PMU_HW_CPU_CYCLES ; active_events[hartid][1 ] =SBI_PMU_EVENT_IDX_INVALID ; - active_events[hartid][2 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_OFFSET | + active_events[hartid][2 ] =SBI_PMU_EVENT_TYPE_HW <<SBI_PMU_EVENT_IDX_TYPE_OFFSET |SBI_PMU_HW_INSTRUCTIONS ;return 0 ; --2.34.1
--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi