mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	Correct a commit515a6393db("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:515a6393db("MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo") Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Reviewed-by: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org # 3.19+ Patchwork: https://patchwork.linux-mips.org/patch/16758/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
		
			
				
	
	
		
			184 lines
		
	
	
	
		
			5.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			184 lines
		
	
	
	
		
			5.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  Copyright (C) 1995, 1996, 2001  Ralf Baechle
 | 
						|
 *  Copyright (C) 2001, 2004  MIPS Technologies, Inc.
 | 
						|
 *  Copyright (C) 2004	Maciej W. Rozycki
 | 
						|
 */
 | 
						|
#include <linux/delay.h>
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/sched.h>
 | 
						|
#include <linux/seq_file.h>
 | 
						|
#include <asm/bootinfo.h>
 | 
						|
#include <asm/cpu.h>
 | 
						|
#include <asm/cpu-features.h>
 | 
						|
#include <asm/idle.h>
 | 
						|
#include <asm/mipsregs.h>
 | 
						|
#include <asm/processor.h>
 | 
						|
#include <asm/prom.h>
 | 
						|
 | 
						|
unsigned int vced_count, vcei_count;
 | 
						|
 | 
						|
/*
 | 
						|
 *  * No lock; only written during early bootup by CPU 0.
 | 
						|
 *   */
 | 
						|
static RAW_NOTIFIER_HEAD(proc_cpuinfo_chain);
 | 
						|
 | 
						|
int __ref register_proc_cpuinfo_notifier(struct notifier_block *nb)
 | 
						|
{
 | 
						|
	return raw_notifier_chain_register(&proc_cpuinfo_chain, nb);
 | 
						|
}
 | 
						|
 | 
						|
int proc_cpuinfo_notifier_call_chain(unsigned long val, void *v)
 | 
						|
{
 | 
						|
	return raw_notifier_call_chain(&proc_cpuinfo_chain, val, v);
 | 
						|
}
 | 
						|
 | 
						|
static int show_cpuinfo(struct seq_file *m, void *v)
 | 
						|
{
 | 
						|
	struct proc_cpuinfo_notifier_args proc_cpuinfo_notifier_args;
 | 
						|
	unsigned long n = (unsigned long) v - 1;
 | 
						|
	unsigned int version = cpu_data[n].processor_id;
 | 
						|
	unsigned int fp_vers = cpu_data[n].fpu_id;
 | 
						|
	char fmt [64];
 | 
						|
	int i;
 | 
						|
 | 
						|
#ifdef CONFIG_SMP
 | 
						|
	if (!cpu_online(n))
 | 
						|
		return 0;
 | 
						|
#endif
 | 
						|
 | 
						|
	/*
 | 
						|
	 * For the first processor also print the system type
 | 
						|
	 */
 | 
						|
	if (n == 0) {
 | 
						|
		seq_printf(m, "system type\t\t: %s\n", get_system_type());
 | 
						|
		if (mips_get_machine_name())
 | 
						|
			seq_printf(m, "machine\t\t\t: %s\n",
 | 
						|
				   mips_get_machine_name());
 | 
						|
	}
 | 
						|
 | 
						|
	seq_printf(m, "processor\t\t: %ld\n", n);
 | 
						|
	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
 | 
						|
		      cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
 | 
						|
	seq_printf(m, fmt, __cpu_name[n],
 | 
						|
		      (version >> 4) & 0x0f, version & 0x0f,
 | 
						|
		      (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
 | 
						|
	seq_printf(m, "BogoMIPS\t\t: %u.%02u\n",
 | 
						|
		      cpu_data[n].udelay_val / (500000/HZ),
 | 
						|
		      (cpu_data[n].udelay_val / (5000/HZ)) % 100);
 | 
						|
	seq_printf(m, "wait instruction\t: %s\n", cpu_wait ? "yes" : "no");
 | 
						|
	seq_printf(m, "microsecond timers\t: %s\n",
 | 
						|
		      cpu_has_counter ? "yes" : "no");
 | 
						|
	seq_printf(m, "tlb_entries\t\t: %d\n", cpu_data[n].tlbsize);
 | 
						|
	seq_printf(m, "extra interrupt vector\t: %s\n",
 | 
						|
		      cpu_has_divec ? "yes" : "no");
 | 
						|
	seq_printf(m, "hardware watchpoint\t: %s",
 | 
						|
		      cpu_has_watch ? "yes, " : "no\n");
 | 
						|
	if (cpu_has_watch) {
 | 
						|
		seq_printf(m, "count: %d, address/irw mask: [",
 | 
						|
		      cpu_data[n].watch_reg_count);
 | 
						|
		for (i = 0; i < cpu_data[n].watch_reg_count; i++)
 | 
						|
			seq_printf(m, "%s0x%04x", i ? ", " : "" ,
 | 
						|
				cpu_data[n].watch_reg_masks[i]);
 | 
						|
		seq_printf(m, "]\n");
 | 
						|
	}
 | 
						|
 | 
						|
	seq_printf(m, "isa\t\t\t:"); 
 | 
						|
	if (cpu_has_mips_1)
 | 
						|
		seq_printf(m, " mips1");
 | 
						|
	if (cpu_has_mips_2)
 | 
						|
		seq_printf(m, "%s", " mips2");
 | 
						|
	if (cpu_has_mips_3)
 | 
						|
		seq_printf(m, "%s", " mips3");
 | 
						|
	if (cpu_has_mips_4)
 | 
						|
		seq_printf(m, "%s", " mips4");
 | 
						|
	if (cpu_has_mips_5)
 | 
						|
		seq_printf(m, "%s", " mips5");
 | 
						|
	if (cpu_has_mips32r1)
 | 
						|
		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:");
 | 
						|
	if (cpu_has_mips16)	seq_printf(m, "%s", " mips16");
 | 
						|
	if (cpu_has_mips16e2)	seq_printf(m, "%s", " mips16e2");
 | 
						|
	if (cpu_has_mdmx)	seq_printf(m, "%s", " mdmx");
 | 
						|
	if (cpu_has_mips3d)	seq_printf(m, "%s", " mips3d");
 | 
						|
	if (cpu_has_smartmips)	seq_printf(m, "%s", " smartmips");
 | 
						|
	if (cpu_has_dsp)	seq_printf(m, "%s", " dsp");
 | 
						|
	if (cpu_has_dsp2)	seq_printf(m, "%s", " dsp2");
 | 
						|
	if (cpu_has_dsp3)	seq_printf(m, "%s", " dsp3");
 | 
						|
	if (cpu_has_mipsmt)	seq_printf(m, "%s", " mt");
 | 
						|
	if (cpu_has_mmips)	seq_printf(m, "%s", " micromips");
 | 
						|
	if (cpu_has_vz)		seq_printf(m, "%s", " vz");
 | 
						|
	if (cpu_has_msa)	seq_printf(m, "%s", " msa");
 | 
						|
	if (cpu_has_eva)	seq_printf(m, "%s", " eva");
 | 
						|
	if (cpu_has_htw)	seq_printf(m, "%s", " htw");
 | 
						|
	if (cpu_has_xpa)	seq_printf(m, "%s", " xpa");
 | 
						|
	seq_printf(m, "\n");
 | 
						|
 | 
						|
	if (cpu_has_mmips) {
 | 
						|
		seq_printf(m, "micromips kernel\t: %s\n",
 | 
						|
		      (read_c0_config3() & MIPS_CONF3_ISA_OE) ?  "yes" : "no");
 | 
						|
	}
 | 
						|
	seq_printf(m, "shadow register sets\t: %d\n",
 | 
						|
		      cpu_data[n].srsets);
 | 
						|
	seq_printf(m, "kscratch registers\t: %d\n",
 | 
						|
		      hweight8(cpu_data[n].kscratch_mask));
 | 
						|
	seq_printf(m, "package\t\t\t: %d\n", cpu_data[n].package);
 | 
						|
	seq_printf(m, "core\t\t\t: %d\n", cpu_data[n].core);
 | 
						|
 | 
						|
#if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_CPU_MIPSR6)
 | 
						|
	if (cpu_has_mipsmt)
 | 
						|
		seq_printf(m, "VPE\t\t\t: %d\n", cpu_data[n].vpe_id);
 | 
						|
	else if (cpu_has_vp)
 | 
						|
		seq_printf(m, "VP\t\t\t: %d\n", cpu_data[n].vpe_id);
 | 
						|
#endif
 | 
						|
 | 
						|
	sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
 | 
						|
		      cpu_has_vce ? "%u" : "not available");
 | 
						|
	seq_printf(m, fmt, 'D', vced_count);
 | 
						|
	seq_printf(m, fmt, 'I', vcei_count);
 | 
						|
 | 
						|
	proc_cpuinfo_notifier_args.m = m;
 | 
						|
	proc_cpuinfo_notifier_args.n = n;
 | 
						|
 | 
						|
	raw_notifier_call_chain(&proc_cpuinfo_chain, 0,
 | 
						|
				&proc_cpuinfo_notifier_args);
 | 
						|
 | 
						|
	seq_printf(m, "\n");
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void *c_start(struct seq_file *m, loff_t *pos)
 | 
						|
{
 | 
						|
	unsigned long i = *pos;
 | 
						|
 | 
						|
	return i < NR_CPUS ? (void *) (i + 1) : NULL;
 | 
						|
}
 | 
						|
 | 
						|
static void *c_next(struct seq_file *m, void *v, loff_t *pos)
 | 
						|
{
 | 
						|
	++*pos;
 | 
						|
	return c_start(m, pos);
 | 
						|
}
 | 
						|
 | 
						|
static void c_stop(struct seq_file *m, void *v)
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
const struct seq_operations cpuinfo_op = {
 | 
						|
	.start	= c_start,
 | 
						|
	.next	= c_next,
 | 
						|
	.stop	= c_stop,
 | 
						|
	.show	= show_cpuinfo,
 | 
						|
};
 |