lib: sbi_pmu: Fix multiple FW counter start operations with custom PMU device
PATCH 1/1 lib: sbi_pmu: Fix multiple FW counter start operations with custom PMU device
Currently, we immediately return the result of fw_counter_start if the event code is 0xFFFF. However, this skips setting the bit in the fw_counters_started bitmap even if the platform-specific call succeeds. Restore the original behavior of returning early only on an error so that we still set the bit in the bitmap. This prevents multiple starts of the same FW counter. This also aligns the expectations of pmu_ctr_start_fw with pmu_ctr_stop_fw since we cannot assume that the platform-specific functions to start and stop FW counters will modify the bitmap state.
--- lib/sbi/sbi_pmu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
lib/sbi/sbi_pmu.c +5 -1
@@ -448,6 +448,8 @@ static int pmu_ctr_start_fw(struct sbi_pmu_hart_state *phs, uint64_t event_data, uint64_t ival, bool ival_update) { + int ret; +if ((event_code >=SBI_PMU_FW_MAX && event_code <=SBI_PMU_FW_RESERVED_MAX ) || event_code >SBI_PMU_FW_PLATFORM )
@@ -468,9 +470,11 @@ static int pmu_ctr_start_fw(struct sbi_pmu_hart_state *phs, cidx - num_hw_ctrs, ival); -return pmu_dev->fw_counter_start (phs->hartid, + ret = pmu_dev->fw_counter_start (phs->hartid, cidx - num_hw_ctrs, event_data); +if (ret) +return ret; }else {if (ival_update) phs->fw_counters_data[cidx - num_hw_ctrs] = ival;
Signature · 7 lines
2.43.0 -- opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi
Quoted 11 lines · James Raphael Tiovalen
Currently, we immediately return the result of
fw_counter_startif the event code is0xFFFF. However, this skips setting the bit in thefw_counters_startedbitmap even if the platform-specific call succeeds. Restore the original behavior of returning early only on an error so that we still set the bit in the bitmap. This prevents multiple starts of the same FW counter. This also aligns the expectations ofpmu_ctr_start_fwwithpmu_ctr_stop_fwsince we cannot assume that the platform-specific functions to start and stop FW counters will modify the bitmap state.
Quoted 2 lines
Fixes 57d3aa3b0dbd ("lib: sbi_pmu: Introduce fw_counter_write_value API")Signed-off-by James Raphael Tiovalen <[email protected]>
LGTM.
Applied this patch to the riscv/opensbi repo.
Thanks,
Anup
Quoted 38 lines
--- lib/sbi/sbi_pmu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)lib/sbi/sbi_pmu.c +5
-2@@ -448,6 +448,8 @@ static int pmu_ctr_start_fw(struct sbi_pmu_hart_state *phs, uint64_t event_data, uint64_t ival, bool ival_update) { + int ret; +if ((event_code >=SBI_PMU_FW_MAX && event_code <=SBI_PMU_FW_RESERVED_MAX ) || event_code >SBI_PMU_FW_PLATFORM )@@ -468,9 +470,11 @@ static int pmu_ctr_start_fw(struct sbi_pmu_hart_state *phs, cidx - num_hw_ctrs, ival); -return pmu_dev->fw_counter_start (phs->hartid, + ret = pmu_dev->fw_counter_start (phs->hartid, cidx - num_hw_ctrs, event_data); +if (ret) +return ret; }else {if (ival_update) phs->fw_counters_data[cidx - num_hw_ctrs] = ival; --2.43.0
--
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
Signature · 3 lines
opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi