Skip to content

Commit c589e3c

Browse files
RISC-V: Avoid coupling the T-Head CMOs and Zicbom
We could make the T-Head CMOs depend on a new-enough assembler to have Zicbom, but it's not strictly necessary because the T-Head CMOs circumvent the assembler. Fixes: 8f7e001 ("RISC-V: Clean up the Zicbom block size probing") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Conor Dooley <conor.dooley@microchip.com> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220915170900.22685-1-palmer@rivosinc.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 762df35 commit c589e3c

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

arch/riscv/include/asm/cacheflush.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@ void flush_icache_mm(struct mm_struct *mm, bool local);
4242

4343
#endif /* CONFIG_SMP */
4444

45-
#ifdef CONFIG_RISCV_ISA_ZICBOM
45+
/*
46+
* The T-Head CMO errata internally probe the CBOM block size, but otherwise
47+
* don't depend on Zicbom.
48+
*/
4649
extern unsigned int riscv_cbom_block_size;
50+
#ifdef CONFIG_RISCV_ISA_ZICBOM
4751
void riscv_init_cbom_blocksize(void);
4852
#else
4953
static inline void riscv_init_cbom_blocksize(void) { }

0 commit comments

Comments
 (0)