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 <eestelle0626@gmail.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20260910182026.6776-1-eestelle0626@gmail.com
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Evgenii Prokopiev authored and Anup Patel committed 2026-10-27 17:28:45 +05:30
1 parent 3a51dc070e
commit d28bc6f898
1 file changed
+4 -3
+4 -3
View File
@@ -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;