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

Commit 84914ed0 authored by Tejun Heo's avatar Tejun Heo
Browse files

x86-32, NUMA: Make apic->x86_32_numa_cpu_node() optional 



NUMAQ is the only meaningful user of this callback and
setup_local_APIC() the only callsite.  Stop torturing everyone else by
making the callback optional and removing all the boilerplate
implementations and assignments.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
parent 6bd26273

arch/x86/include/asm/apic.h

+6 −3
Original line number Diff line number Diff line
@@ -363,7 +363,12 @@ struct apic { 
	 */

	int (*x86_32_early_logical_apicid)(int cpu);



	/* determine CPU -> NUMA node mapping */

	/*

	 * Optional method called from setup_local_APIC() after logical

	 * apicid is guaranteed to be known to initialize apicid -> node

	 * mapping if NUMA initialization hasn't done so already.  Don't

	 * add new users.

	 */

	int (*x86_32_numa_cpu_node)(int cpu);

#endif

};
@@ -537,8 +542,6 @@ static inline int default_phys_pkg_id(int cpuid_apic, int index_msb) 
	return cpuid_apic >> index_msb;

}



extern int default_x86_32_numa_cpu_node(int cpu);



#endif



static inline unsigned int

arch/x86/kernel/apic/apic.c

+3 −17
Original line number Diff line number Diff line
@@ -1245,6 +1245,7 @@ void __cpuinit setup_local_APIC(void) 
	 * a bit too late - percpu allocation has already happened without

	 * proper NUMA affinity.

	 */

	if (apic->x86_32_numa_cpu_node)

		set_apicid_to_node(early_per_cpu(x86_cpu_to_apicid, cpu),

				   apic->x86_32_numa_cpu_node(cpu));

#endif
@@ -2013,21 +2014,6 @@ void default_init_apic_ldr(void) 
	apic_write(APIC_LDR, val);

}



#ifdef CONFIG_X86_32

int default_x86_32_numa_cpu_node(int cpu)

{

#ifdef CONFIG_NUMA

	int apicid = early_per_cpu(x86_cpu_to_apicid, cpu);



	if (apicid != BAD_APICID)

		return __apicid_to_node[apicid];

	return NUMA_NO_NODE;

#else

	return 0;

#endif

}

#endif



/*

 * Power management

 */

arch/x86/kernel/apic/apic_noop.c

+0 −9
Original line number Diff line number Diff line
@@ -119,14 +119,6 @@ static void noop_apic_write(u32 reg, u32 v) 
	WARN_ON_ONCE(cpu_has_apic && !disable_apic);

}



#ifdef CONFIG_X86_32

static int noop_x86_32_numa_cpu_node(int cpu)

{

	/* we're always on node 0 */

	return 0;

}

#endif



struct apic apic_noop = {

	.name				= "noop",

	.probe				= noop_probe,
@@ -195,6 +187,5 @@ struct apic apic_noop = { 


#ifdef CONFIG_X86_32

	.x86_32_early_logical_apicid	= noop_x86_32_early_logical_apicid,

	.x86_32_numa_cpu_node		= noop_x86_32_numa_cpu_node,

#endif

};

arch/x86/kernel/apic/bigsmp_32.c

+0 −1
Original line number Diff line number Diff line
@@ -253,5 +253,4 @@ struct apic apic_bigsmp = { 
	.safe_wait_icr_idle		= native_safe_apic_wait_icr_idle,



	.x86_32_early_logical_apicid	= bigsmp_early_logical_apicid,

	.x86_32_numa_cpu_node		= default_x86_32_numa_cpu_node,

};

arch/x86/kernel/apic/es7000_32.c

+0 −7
Original line number Diff line number Diff line
@@ -510,11 +510,6 @@ static void es7000_setup_apic_routing(void) 
		nr_ioapics, cpumask_bits(es7000_target_cpus())[0]);

}



static int es7000_numa_cpu_node(int cpu)

{

	return 0;

}



static int es7000_cpu_present_to_apicid(int mps_cpu)

{

	if (!mps_cpu)
@@ -688,7 +683,6 @@ struct apic __refdata apic_es7000_cluster = { 
	.safe_wait_icr_idle		= native_safe_apic_wait_icr_idle,



	.x86_32_early_logical_apicid	= es7000_early_logical_apicid,

	.x86_32_numa_cpu_node		= es7000_numa_cpu_node,

};



struct apic __refdata apic_es7000 = {
@@ -752,5 +746,4 @@ struct apic __refdata apic_es7000 = { 
	.safe_wait_icr_idle		= native_safe_apic_wait_icr_idle,



	.x86_32_early_logical_apicid	= es7000_early_logical_apicid,

	.x86_32_numa_cpu_node		= es7000_numa_cpu_node,

};