Skip to content

Commit 181f2a2

Browse files
Andrew Jonespalmer-dabbelt
authored andcommitted
RISC-V: Make zicbom/zicboz errors consistent
commit c818fea ("riscv: say disabling zicbom if no or bad riscv,cbom-block-size found") improved the error messages for zicbom but zicboz was missed since its patches were in flight at the same time. Get 'em now. Signed-off-by: Andrew Jones <ajones@ventanamicro.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20230918131518.56803-9-ajones@ventanamicro.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 0bb80ec commit 181f2a2

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/riscv/kernel/cpufeature.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ static bool riscv_isa_extension_check(int id)
9393
return true;
9494
case RISCV_ISA_EXT_ZICBOZ:
9595
if (!riscv_cboz_block_size) {
96-
pr_err("Zicboz detected in ISA string, but no cboz-block-size found\n");
96+
pr_err("Zicboz detected in ISA string, disabling as no cboz-block-size found\n");
9797
return false;
9898
} else if (!is_power_of_2(riscv_cboz_block_size)) {
99-
pr_err("cboz-block-size present, but is not a power-of-2\n");
99+
pr_err("Zicboz disabled as cboz-block-size present, but is not a power-of-2\n");
100100
return false;
101101
}
102102
return true;

0 commit comments

Comments
 (0)