MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo

Print 'mips64r6' and/or 'mips32r6' if the kernel is running on
a MIPS R6 core.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>

2 files changed, 10 insertions, 1 deletions

diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index 799dc6db7847..08d1bbe905eb 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -171,6 +171,9 @@
 #endif
 #endif
 
+#ifndef cpu_has_mips_1
+# define cpu_has_mips_1         (!cpu_has_mips_r6)
+#endif
 #ifndef cpu_has_mips_2
 # define cpu_has_mips_2         (cpu_data[0].isa_level & MIPS_CPU_ISA_II)
 #endif
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 097fc8d14e42..130af7d26a9c 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -82,7 +82,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 seq_printf(m, "]\n");
         }
 
-        seq_printf(m, "isa\t\t\t: mips1");
+        seq_printf(m, "isa\t\t\t:"); 
+        if (cpu_has_mips_r1)
+                seq_printf(m, " mips1");
         if (cpu_has_mips_2)
                 seq_printf(m, "%s", " mips2");
         if (cpu_has_mips_3)
@@ -95,10 +97,14 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 seq_printf(m, "%s", " mips32r1");
         if (cpu_has_mips32r2)
                 seq_printf(m, "%s", " mips32r2");
+        if (cpu_has_mips32r6)
+                seq_printf(m, "%s", " mips32r6");
         if (cpu_has_mips64r1)
                 seq_printf(m, "%s", " mips64r1");
         if (cpu_has_mips64r2)
                 seq_printf(m, "%s", " mips64r2");
+        if (cpu_has_mips64r6)
+                seq_printf(m, "%s", " mips64r6");
         seq_printf(m, "\n");
 
         seq_printf(m, "ASEs implemented\t:");