Unverified Commit 181f2a28 authored Sep 18, 2023 by Andrew Jones Committed by Palmer Dabbelt Sep 21, 2023

RISC-V: Make zicbom/zicboz errors consistent



commit c818fea8 ("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>

parent 0bb80ecc

arch/riscv/kernel/cpufeature.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -93,10 +93,10 @@ static bool riscv_isa_extension_check(int id)
		return true;
		case RISCV_ISA_EXT_ZICBOZ:
		if (!riscv_cboz_block_size) {
		pr_err("Zicboz detected in ISA string, but no cboz-block-size found\n");
		pr_err("Zicboz detected in ISA string, disabling as no cboz-block-size found\n");
		return false;
		} else if (!is_power_of_2(riscv_cboz_block_size)) {
		pr_err("cboz-block-size present, but is not a power-of-2\n");
		pr_err("Zicboz disabled as cboz-block-size present, but is not a power-of-2\n");
		return false;
		}
		return true;