| Message ID | 20230317134512.254627-1-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c818fea83de4cdf5072c7cf00dd289fc9c6e1c68 |
| Delegated to: | Palmer Dabbelt |
| Headers | show |
| Series | riscv: say disabling zicbom if no or bad riscv,cbom-block-size found | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Single patches do not need cover letters |
| conchuod/tree_selection | success | Guessed tree name to be for-next |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 1 and now 1 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/build_rv64_clang_allmodconfig | success | Errors and warnings before: 18 this patch: 18 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 18 this patch: 18 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 3 this patch: 3 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 12 lines checked |
| conchuod/source_inline | success | Was 0 now: 0 |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | No Fixes tag |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
On Fri, Mar 17, 2023 at 01:45:12PM +0000, Ben Dooks wrote: > 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. > Being explicit seems like a good idea, Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> > --- > arch/riscv/kernel/cpufeature.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c > index 59d58ee0f68d..c8b883827840 100644 > --- a/arch/riscv/kernel/cpufeature.c > +++ b/arch/riscv/kernel/cpufeature.c > @@ -72,10 +72,10 @@ static bool riscv_isa_extension_check(int id) > switch (id) { > case RISCV_ISA_EXT_ZICBOM: > if (!riscv_cbom_block_size) { > - pr_err("Zicbom detected in ISA string, but no cbom-block-size found\n"); > + pr_err("Zicbom detected in ISA string, disabling as no cbom-block-size found\n"); > return false; > } else if (!is_power_of_2(riscv_cbom_block_size)) { > - pr_err("cbom-block-size present, but is not a power-of-2\n"); > + pr_err("Zicbom disabled as cbom-block-size present, but is not a power-of-2\n"); > return false; > } > return true; > -- > 2.39.2 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Fri, Mar 17, 2023 at 01:45:12PM +0000, Ben Dooks wrote: > 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 <ben.dooks@codethink.co.uk> > --- > arch/riscv/kernel/cpufeature.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c > index 59d58ee0f68d..c8b883827840 100644 > --- a/arch/riscv/kernel/cpufeature.c > +++ b/arch/riscv/kernel/cpufeature.c > @@ -72,10 +72,10 @@ static bool riscv_isa_extension_check(int id) > switch (id) { > case RISCV_ISA_EXT_ZICBOM: > if (!riscv_cbom_block_size) { > - pr_err("Zicbom detected in ISA string, but no cbom-block-size found\n"); > + pr_err("Zicbom detected in ISA string, disabling as no cbom-block-size found\n"); > return false; > } else if (!is_power_of_2(riscv_cbom_block_size)) { > - pr_err("cbom-block-size present, but is not a power-of-2\n"); > + pr_err("Zicbom disabled as cbom-block-size present, but is not a power-of-2\n"); > return false; > } > return true; > -- > 2.39.2 > Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Thanks, drew
On Fri, Mar 17, 2023 at 01:45:12PM +0000, Ben Dooks wrote: > 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 <ben.dooks@codethink.co.uk> > --- > arch/riscv/kernel/cpufeature.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c > index 59d58ee0f68d..c8b883827840 100644 > --- a/arch/riscv/kernel/cpufeature.c > +++ b/arch/riscv/kernel/cpufeature.c > @@ -72,10 +72,10 @@ static bool riscv_isa_extension_check(int id) > switch (id) { > case RISCV_ISA_EXT_ZICBOM: > if (!riscv_cbom_block_size) { > - pr_err("Zicbom detected in ISA string, but no cbom-block-size found\n"); > + pr_err("Zicbom detected in ISA string, disabling as no cbom-block-size found\n"); > return false; > } else if (!is_power_of_2(riscv_cbom_block_size)) { > - pr_err("cbom-block-size present, but is not a power-of-2\n"); > + pr_err("Zicbom disabled as cbom-block-size present, but is not a power-of-2\n"); > return false; > } > return true; > -- > 2.39.2 > Hi Ben, If you wanted to rebase this on riscv-linux/for-next, then you could make the same changes for zicboz at the same time. Thanks, drew
On Fri, 17 Mar 2023 13:45:12 +0000, Ben Dooks wrote: > 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. > > Applied, thanks! [1/1] riscv: say disabling zicbom if no or bad riscv,cbom-block-size found https://git.kernel.org/palmer/c/c818fea83de4 Best regards,
Hello: This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <palmer@rivosinc.com>: On Fri, 17 Mar 2023 13:45:12 +0000 you wrote: > 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 <ben.dooks@codethink.co.uk> > > [...] Here is the summary with links: - riscv: say disabling zicbom if no or bad riscv,cbom-block-size found https://git.kernel.org/riscv/c/c818fea83de4 You are awesome, thank you!
diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 59d58ee0f68d..c8b883827840 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -72,10 +72,10 @@ static bool riscv_isa_extension_check(int id) switch (id) { case RISCV_ISA_EXT_ZICBOM: if (!riscv_cbom_block_size) { - pr_err("Zicbom detected in ISA string, but no cbom-block-size found\n"); + pr_err("Zicbom detected in ISA string, disabling as no cbom-block-size found\n"); return false; } else if (!is_power_of_2(riscv_cbom_block_size)) { - pr_err("cbom-block-size present, but is not a power-of-2\n"); + pr_err("Zicbom disabled as cbom-block-size present, but is not a power-of-2\n"); return false; } return true;
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 <ben.dooks@codethink.co.uk> --- arch/riscv/kernel/cpufeature.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)