Commit 515a6393 authored by Markos Chandras's avatar Markos Chandras
Browse files

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: default avatarMarkos Chandras <markos.chandras@imgtec.com>
parent 6ebb496f

arch/mips/include/asm/cpu-features.h

+3 −0
Original line number Diff line number Diff line
@@ -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

arch/mips/kernel/proc.c

+7 −1
Original line number Diff line number Diff line
@@ -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:");