Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68894632 authored Apr 02, 2012 by Andreas Herrmann Committed by Ingo Molnar Apr 16, 2012

x86/platform: Remove incorrect error message in x86_default_fixup_cpu_id()



It's only called from amd.c:srat_detect_node(). The introduced
condition for calling the fixup code is true for all AMD
multi-node processors, e.g. Magny-Cours and Interlagos. There we
have 2 NUMA nodes on one socket. Thus there are cores having
different numa-node-id but with equal phys_proc_id.

There is no point to print error messages in such a situation.

The confusing/misleading error message was introduced with
commit 64be4c1c ("x86: Add
x86_init platform override to fix up NUMA core numbering").

Remove the default fixup function (especially the error message)
and replace it by a NULL pointer check, move the
Numascale-specific condition for calling the fixup into the
fixup-function itself and slightly adapt the comment.

Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: <stable@kernel.org>
Cc: <sp@numascale.com>
Cc: <bp@amd64.org>
Cc: <daniel@numascale-asia.com>
Link: http://lkml.kernel.org/r/20120402160648.GR27684@alberich.amd.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent b1994304

arch/x86/include/asm/x86_init.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -195,6 +195,5 @@ extern struct x86_msi_ops x86_msi;

	extern void x86_init_noop(void);		extern void x86_init_noop(void);
	extern void x86_init_uint_noop(unsigned int unused);		extern void x86_init_uint_noop(unsigned int unused);
	extern void x86_default_fixup_cpu_id(struct cpuinfo_x86 *c, int node);

	#endif		#endif

arch/x86/kernel/apic/apic_numachip.c

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -207,9 +207,12 @@ static void __init map_csrs(void)

	static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)		static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)
	{		{

			if (c->phys_proc_id != node) {
	c->phys_proc_id = node;		c->phys_proc_id = node;
	per_cpu(cpu_llc_id, smp_processor_id()) = node;		per_cpu(cpu_llc_id, smp_processor_id()) = node;
	}		}
			}

	static int __init numachip_system_init(void)		static int __init numachip_system_init(void)
	{		{

arch/x86/kernel/cpu/amd.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -353,10 +353,11 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)
	node = per_cpu(cpu_llc_id, cpu);		node = per_cpu(cpu_llc_id, cpu);

	/*		/*
	* If core numbers are inconsistent, it's likely a multi-fabric platform,		* On multi-fabric platform (e.g. Numascale NumaChip) a
	* so invoke platform-specific handler		* platform-specific handler needs to be called to fixup some
			* IDs of the CPU.
	*/		*/
	if (c->phys_proc_id != node)		if (x86_cpuinit.fixup_cpu_id)
	x86_cpuinit.fixup_cpu_id(c, node);		x86_cpuinit.fixup_cpu_id(c, node);

	if (!node_online(node)) {		if (!node_online(node)) {

arch/x86/kernel/cpu/common.c

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1162,15 +1162,6 @@ static void dbg_restore_debug_regs(void)
	#define dbg_restore_debug_regs()		#define dbg_restore_debug_regs()
	#endif /* ! CONFIG_KGDB */		#endif /* ! CONFIG_KGDB */

	/*
	* Prints an error where the NUMA and configured core-number mismatch and the
	* platform didn't override this to fix it up
	*/
	void __cpuinit x86_default_fixup_cpu_id(struct cpuinfo_x86 *c, int node)
	{
	pr_err("NUMA core number %d differs from configured core number %d\n", node, c->phys_proc_id);
	}

	/*		/*
	* cpu_init() initializes state that is per-CPU. Some data is already		* cpu_init() initializes state that is per-CPU. Some data is already
	* initialized (naturally) in the bootstrap process, such as the GDT		* initialized (naturally) in the bootstrap process, such as the GDT

arch/x86/kernel/x86_init.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,6 @@ struct x86_init_ops x86_init __initdata = {
	struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {		struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
	.early_percpu_clock_init = x86_init_noop,		.early_percpu_clock_init = x86_init_noop,
	.setup_percpu_clockev = setup_secondary_APIC_clock,		.setup_percpu_clockev = setup_secondary_APIC_clock,
	.fixup_cpu_id = x86_default_fixup_cpu_id,
	};		};

	static void default_nmi_init(void) { };		static void default_nmi_init(void) { };