riscv: Don't output a bogus mmu-type on a no MMU kernel

Currently on a 64-bit kernel built without CONFIG_MMU, /proc/cpuinfo will
show the current MMU mode as sv57.

While the device tree property "mmu-type" does have a value "riscv,none" to
describe a CPU without a MMU, since commit 73c7c8f68e72 ("riscv: Use
pgtable_l4_enabled to output mmu_type in cpuinfo"), we no longer rely on
device tree to output the MMU mode. (Not even for CONFIG_32BIT.)

Therefore, instead of readding code to look at the "mmu-type" device tree
property, let's continue with the existing convention to use fixed values
for configurations where we don't determine the MMU mode at runtime.

Add a new fixed value for !CONFIG_MMU in order to output the correct
MMU mode in cpuinfo.

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Link: https://lore.kernel.org/r/20220414173037.1381927-1-niklas.cassel@wdc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c
index 40c8776aec12a41687549198c20e9ecf9bfe9fe6..fba9e9f46a8c7aa4cc54c681341caaab368f9f1a 100644 (file)
--- a/arch/riscv/kernel/cpu.c
+++ b/arch/riscv/kernel/cpu.c
@@ -139,6 +139,7 @@ static void print_mmu(struct seq_file *f)
 {
        char sv_type[16];
 
+#ifdef CONFIG_MMU
 #if defined(CONFIG_32BIT)
        strncpy(sv_type, "sv32", 5);
 #elif defined(CONFIG_64BIT)
@@ -149,6 +150,9 @@ static void print_mmu(struct seq_file *f)
        else
                strncpy(sv_type, "sv39", 5);
 #endif
+#else
+       strncpy(sv_type, "none", 5);
+#endif /* CONFIG_MMU */
        seq_printf(f, "mmu\t\t: %s\n", sv_type);
 }