riscv: errata: thead: only set cbom size & noncoherent during boot

The CBOM size and whether the HW is noncoherent is known and
determined during booting and won't change after that.

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230614165504.532-2-jszhang@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c
index c259dc925ec1e796d7300bdddfe5bde704bffd7d..be84b14f01180a1db6b80846d5ce8be6a16a6b8c 100644 (file)
--- a/arch/riscv/errata/thead/errata.c
+++ b/arch/riscv/errata/thead/errata.c
@@ -45,8 +45,11 @@ static bool errata_probe_cmo(unsigned int stage,
        if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
                return false;
 
-       riscv_cbom_block_size = L1_CACHE_BYTES;
-       riscv_noncoherent_supported();
+       if (stage == RISCV_ALTERNATIVES_BOOT) {
+               riscv_cbom_block_size = L1_CACHE_BYTES;
+               riscv_noncoherent_supported();
+       }
+
        return true;
 }