Skip to contentSkip to conversation

Patch "MIPS: Fix MIPS I ISA /proc/cpuinfo reporting" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jul 25, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: Fix MIPS I ISA /proc/cpuinfo reporting

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-fix-mips-i-isa-proc-cpuinfo-reporting.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e5f5a5b06e51a36f6ddf31a4a485358263953a3d Mon Sep 17 00:00:00 2001

From: "Maciej W. Rozycki" <[email protected]>
Date: Sat, 8 Jul 2017 23:24:44 +0100
Subject: MIPS: Fix MIPS I ISA /proc/cpuinfo reporting

From: Maciej W. Rozycki <[email protected]>

commit e5f5a5b06e51a36f6ddf31a4a485358263953a3d upstream.

Correct a commit 515a6393dbac ("MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo") regression that caused MIPS I systems to show no ISA levels supported in /proc/cpuinfo, e.g.:

system type : Digital DECstation 2100/3100
machine : Unknown
processor : 0
cpu model : R3000 V2.0 FPU V2.0
BogoMIPS : 10.69
wait instruction : no
microsecond timers : no
tlb_entries : 64
extra interrupt vector : no
hardware watchpoint : no
isa :
ASEs implemented :
shadow register sets : 1
kscratch registers : 0
package : 0
core : 0
VCED exceptions : not available
VCEI exceptions : not available

and similarly exclude mips1' from the ISA list for any processors below MIPSr1. This is because the condition to show mips1' on has been made cpu_has_mips_r1' rather than newly-introduced cpu_has_mips_1'. Use the correct condition then.

Fixes 515a6393dbac ("MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo")

Patchwork: https://patchwork.linux-mips.org/patch/16758/

---
 arch/mips/kernel/proc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/proc.c +1 -1
@@ -83,7 +83,7 @@ static int show_cpuinfo(struct seq_file
 	}
 
 	seq_printf(m, "isa\t\t\t:"); 
-	if (cpu_has_mips_r1)
+	if (cpu_has_mips_1)
 		seq_printf(m, " mips1");
 	if (cpu_has_mips_2)
 		seq_printf(m, "%s", " mips2");

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/mips-fix-mips-i-isa-proc-cpuinfo-reporting.patch