Skip to content

Commit c818fea

Browse files
bjdooks-ctpalmer-dabbelt
authored andcommitted
riscv: say disabling zicbom if no or bad riscv,cbom-block-size found
If Zicbom is present but there was no riscv,cbom-blocks-size property found during the cpu feeatures probe, or the cbom-block-size is not valid, then the extension will be disabled. Make the print explicitly say this is disabled to ensure that there is no confusion about what is being done. Signed-off-by: Ben Dooks <[email protected]> Reviewed-by: Conor Dooley <[email protected]> Reviewed-by: Andrew Jones <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent d5e45e8 commit c818fea

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/riscv/kernel/cpufeature.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ static bool riscv_isa_extension_check(int id)
7575
switch (id) {
7676
case RISCV_ISA_EXT_ZICBOM:
7777
if (!riscv_cbom_block_size) {
78-
pr_err("Zicbom detected in ISA string, but no cbom-block-size found\n");
78+
pr_err("Zicbom detected in ISA string, disabling as no cbom-block-size found\n");
7979
return false;
8080
} else if (!is_power_of_2(riscv_cbom_block_size)) {
81-
pr_err("cbom-block-size present, but is not a power-of-2\n");
81+
pr_err("Zicbom disabled as cbom-block-size present, but is not a power-of-2\n");
8282
return false;
8383
}
8484
return true;

0 commit comments

Comments
 (0)