Unverified Commit 0209b583 authored by Atish Patra's avatar Atish Patra Committed by Palmer Dabbelt
Browse files

RISC-V: Fix SBI PMU calls for RV32 



Some of the SBI PMU calls does not pass 64bit arguments
correctly and not under RV32 compile time flags. Currently,
this doesn't create any incorrect results as RV64 ignores
any value in the additional register and qemu doesn't support
raw events.

Fix those SBI calls in order to set correct values for RV32.

Fixes: e9991434 ("RISC-V: Add perf platform driver based on SBI PMU extension")
Signed-off-by: default avatarAtish Patra <atishp@rivosinc.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220711174632.4186047-4-atishp@rivosinc.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 133a6d1f

drivers/perf/riscv_pmu_sbi.c

+10 −0
Original line number Diff line number Diff line
@@ -274,8 +274,13 @@ static int pmu_sbi_ctr_get_idx(struct perf_event *event) 
		cflags |= SBI_PMU_CFG_FLAG_SET_UINH;



	/* retrieve the available counter index */

#if defined(CONFIG_32BIT)

	ret = sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_COUNTER_CFG_MATCH, cbase, cmask,

			cflags, hwc->event_base, hwc->config, hwc->config >> 32);

#else

	ret = sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_COUNTER_CFG_MATCH, cbase, cmask,

			cflags, hwc->event_base, hwc->config, 0);

#endif

	if (ret.error) {

		pr_debug("Not able to find a counter for event %lx config %llx\n",

			hwc->event_base, hwc->config);
@@ -417,8 +422,13 @@ static void pmu_sbi_ctr_start(struct perf_event *event, u64 ival) 
	struct hw_perf_event *hwc = &event->hw;

	unsigned long flag = SBI_PMU_START_FLAG_SET_INIT_VALUE;



#if defined(CONFIG_32BIT)

	ret = sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_COUNTER_START, hwc->idx,

			1, flag, ival, ival >> 32, 0);

#else

	ret = sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_COUNTER_START, hwc->idx,

			1, flag, ival, 0, 0);

#endif

	if (ret.error && (ret.error != SBI_ERR_ALREADY_STARTED))

		pr_err("Starting counter idx %d failed with error %d\n",

			hwc->idx, sbi_err_map_linux_errno(ret.error));