From d28bc6f89837de34aa94a0c95201b916af6aaf8a Mon Sep 17 00:00:00 2001 From: Evgenii Prokopiev Date: Tue, 27 Oct 2026 17:28:45 +0530 Subject: [PATCH] lib: sbi_hart: Retrun zero length of mhpmcounter when probing failed If writing access is not allowed, it will raise a trap, but we increase the number of allowed bits to 32 in this approach, which isn't right. There must be a write of 0. Move the operation of increasing allowed bits into the 'if' condition. Signed-off-by: Evgenii Prokopiev Reviewed-by: Anup Patel Link: https://lore.kernel.org/r/20260910182026.6776-1-eestelle0626@gmail.com Signed-off-by: Anup Patel --- lib/sbi/sbi_hart.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index c195db75..7fc49cf7 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -451,8 +451,9 @@ static int hart_mhpm_get_allowed_bits(void) csr_write(CSR_MHPMCOUNTER3, 0); if (trap.cause) return 0; + + num_bits = sbi_fls(val) + 1; } - num_bits = sbi_fls(val) + 1; #if __riscv_xlen == 32 csr_write_allowed(CSR_MHPMCOUNTER3H, &trap, val); if (!trap.cause) { @@ -460,9 +461,9 @@ static int hart_mhpm_get_allowed_bits(void) csr_write(CSR_MHPMCOUNTER3H, 0); if (trap.cause) return num_bits; - } - num_bits += sbi_fls(val) + 1; + num_bits += sbi_fls(val) + 1; + } #endif return num_bits;