MIPS: Move identification of VP(E) into proc.c from smp-mt.c (765b0647) · Commits · 戴 / test

The addition of VPE information to /proc/cpuinfo used to be in smp-mt.c. This file is not used by MIPS r6 kernels, so the Virtual Processor information was not present for these CPU types. Move the code to print VPE information into proc.c, add a case for MIPS r6 CPUS, and remove the block from smp-mt.c. Signed-off-by:

Matt Redfearn <matt.redfearn@imgtec.com> Reviewed-by:

Paul Burton <paul.burton@imgtec.com> Cc: Qais Yousef <qsyousef@gmail.com> Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/13847/ Signed-off-by:

Ralf Baechle <ralf@linux-mips.org>

arch/mips/kernel/proc.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,13 @@ static int show_cpuinfo(struct seq_file m, void v)
		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);

arch/mips/kernel/smp-mt.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -289,26 +289,3 @@ struct plat_smp_ops vsmp_smp_ops = {
		.prepare_cpus = vsmp_prepare_cpus,
		};

		#ifdef CONFIG_PROC_FS
		static int proc_cpuinfo_chain_call(struct notifier_block *nfb,
		unsigned long action_unused, void *data)
		{
		struct proc_cpuinfo_notifier_args *pcn = data;
		struct seq_file *m = pcn->m;
		unsigned long n = pcn->n;

		if (!cpu_has_mipsmt)
		return NOTIFY_OK;

		seq_printf(m, "VPE\t\t\t: %d\n", cpu_data[n].vpe_id);

		return NOTIFY_OK;
		}

		static int __init proc_cpuinfo_notifier_init(void)
		{
		return proc_cpuinfo_notifier(proc_cpuinfo_chain_call, 0);
		}

		subsys_initcall(proc_cpuinfo_notifier_init);
		#endif

Admin message