]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
RISC-V: Make zicbom/zicboz errors consistent
authorAndrew Jones <ajones@ventanamicro.com>
Mon, 18 Sep 2023 13:15:20 +0000 (15:15 +0200)
committerPalmer Dabbelt <palmer@rivosinc.com>
Thu, 21 Sep 2023 11:22:23 +0000 (04:22 -0700)
commit c818fea83de4 ("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>
arch/riscv/kernel/cpufeature.c

index 1cfbba65d11ae311d54729966e57fb3c9386d61c..f9ac2717bc7d71cdcf979ac26be4b3ea4f79323a 100644 (file)
@@ -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;