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

Commit 7632611f authored by Tejun Heo's avatar Tejun Heo Committed by Ingo Molnar
Browse files

x86: Kill apic->cpu_to_logical_apicid() 



After the previous patch, apic->cpu_to_logical_apicid() is no
longer used.  Kill it.

For apic types with custom cpu_to_logical_apicid() which is also
used for other purposes, remove the function and modify its
users to do the mapping directly.

#ifdef's on CONFIG_SMP in es7000_32 and summit_32 are ignored
during conversion as they are not used for UP kernels.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: eric.dumazet@gmail.com
Cc: yinghai@kernel.org
Cc: brgerst@gmail.com
Cc: gorcunov@gmail.com
Cc: penberg@kernel.org
Cc: shaohui.zheng@intel.com
Cc: rientjes@google.com
LKML-Reference: <1295789862-25482-7-git-send-email-tj@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6f802c4b

arch/x86/include/asm/apic.h

+0 −7
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ struct apic { 
	void (*setup_apic_routing)(void);

	int (*multi_timer_check)(int apic, int irq);

	int (*apicid_to_node)(int logical_apicid);

	int (*cpu_to_logical_apicid)(int cpu);

	int (*cpu_present_to_apicid)(int mps_cpu);

	void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap);

	void (*setup_portio_remap)(void);
@@ -557,12 +556,6 @@ static inline void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_ma 
	*retmap = *phys_map;

}



/* Mapping from cpu number to logical apicid */

static inline int default_cpu_to_logical_apicid(int cpu)

{

	return 1 << cpu;

}



static inline int __default_cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu))

arch/x86/kernel/apic/apic_flat_64.c

+0 −2
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ struct apic apic_flat = { 
	.setup_apic_routing		= NULL,

	.multi_timer_check		= NULL,

	.apicid_to_node			= NULL,

	.cpu_to_logical_apicid		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.setup_portio_remap		= NULL,
@@ -338,7 +337,6 @@ struct apic apic_physflat = { 
	.setup_apic_routing		= NULL,

	.multi_timer_check		= NULL,

	.apicid_to_node			= NULL,

	.cpu_to_logical_apicid		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.setup_portio_remap		= NULL,

arch/x86/kernel/apic/apic_noop.c

+0 −6
Original line number Diff line number Diff line
@@ -54,11 +54,6 @@ static u64 noop_apic_icr_read(void) 
	return 0;

}



static int noop_cpu_to_logical_apicid(int cpu)

{

	return 0;

}



static int noop_phys_pkg_id(int cpuid_apic, int index_msb)

{

	return 0;
@@ -155,7 +150,6 @@ struct apic apic_noop = { 
	.multi_timer_check		= NULL,

	.apicid_to_node			= noop_apicid_to_node,



	.cpu_to_logical_apicid		= noop_cpu_to_logical_apicid,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= physid_set_mask_of_physid,

arch/x86/kernel/apic/bigsmp_32.c

+7 −12
Original line number Diff line number Diff line
@@ -93,14 +93,6 @@ static int bigsmp_cpu_present_to_apicid(int mps_cpu) 
	return BAD_APICID;

}



/* Mapping from cpu number to logical apicid */

static inline int bigsmp_cpu_to_logical_apicid(int cpu)

{

	if (cpu >= nr_cpu_ids)

		return BAD_APICID;

	return cpu_physical_id(cpu);

}



static void bigsmp_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap)

{

	/* For clustered we don't have a good way to do this yet - hack */
@@ -115,7 +107,11 @@ static int bigsmp_check_phys_apicid_present(int phys_apicid) 
/* As we are using single CPU as destination, pick only one CPU here */

static unsigned int bigsmp_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

	return bigsmp_cpu_to_logical_apicid(cpumask_first(cpumask));

	int cpu = cpumask_first(cpumask);



	if (cpu < nr_cpu_ids)

		return cpu_physical_id(cpu);

	return BAD_APICID;

}



static unsigned int bigsmp_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
@@ -129,9 +125,9 @@ static unsigned int bigsmp_cpu_mask_to_apicid_and(const struct cpumask *cpumask, 
	 */

	for_each_cpu_and(cpu, cpumask, andmask) {

		if (cpumask_test_cpu(cpu, cpu_online_mask))

			break;

			return cpu_physical_id(cpu);

	}

	return bigsmp_cpu_to_logical_apicid(cpu);

	return BAD_APICID;

}



static int bigsmp_phys_pkg_id(int cpuid_apic, int index_msb)
@@ -220,7 +216,6 @@ struct apic apic_bigsmp = { 
	.setup_apic_routing		= bigsmp_setup_apic_routing,

	.multi_timer_check		= NULL,

	.apicid_to_node			= bigsmp_apicid_to_node,

	.cpu_to_logical_apicid		= bigsmp_cpu_to_logical_apicid,

	.cpu_present_to_apicid		= bigsmp_cpu_present_to_apicid,

	.apicid_to_cpu_present		= physid_set_mask_of_physid,

	.setup_portio_remap		= NULL,

arch/x86/kernel/apic/es7000_32.c

+2 −16
Original line number Diff line number Diff line
@@ -528,18 +528,6 @@ static void es7000_apicid_to_cpu_present(int phys_apicid, physid_mask_t *retmap) 
	++cpu_id;

}



/* Mapping from cpu number to logical apicid */

static int es7000_cpu_to_logical_apicid(int cpu)

{

#ifdef CONFIG_SMP

	if (cpu >= nr_cpu_ids)

		return BAD_APICID;

	return early_per_cpu(x86_cpu_to_logical_apicid, cpu);

#else

	return logical_smp_processor_id();

#endif

}



static void es7000_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap)

{

	/* For clustered we don't have a good way to do this yet - hack */
@@ -561,7 +549,7 @@ static unsigned int es7000_cpu_mask_to_apicid(const struct cpumask *cpumask) 
	 * The cpus in the mask must all be on the apic cluster.

	 */

	for_each_cpu(cpu, cpumask) {

		int new_apicid = es7000_cpu_to_logical_apicid(cpu);

		int new_apicid = early_per_cpu(x86_cpu_to_logical_apicid, cpu);



		if (round && APIC_CLUSTER(apicid) != APIC_CLUSTER(new_apicid)) {

			WARN(1, "Not a valid mask!");
@@ -578,7 +566,7 @@ static unsigned int 
es7000_cpu_mask_to_apicid_and(const struct cpumask *inmask,

			      const struct cpumask *andmask)

{

	int apicid = es7000_cpu_to_logical_apicid(0);

	int apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0);

	cpumask_var_t cpumask;



	if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC))
@@ -656,7 +644,6 @@ struct apic __refdata apic_es7000_cluster = { 
	.setup_apic_routing		= es7000_setup_apic_routing,

	.multi_timer_check		= NULL,

	.apicid_to_node			= es7000_apicid_to_node,

	.cpu_to_logical_apicid		= es7000_cpu_to_logical_apicid,

	.cpu_present_to_apicid		= es7000_cpu_present_to_apicid,

	.apicid_to_cpu_present		= es7000_apicid_to_cpu_present,

	.setup_portio_remap		= NULL,
@@ -721,7 +708,6 @@ struct apic __refdata apic_es7000 = { 
	.setup_apic_routing		= es7000_setup_apic_routing,

	.multi_timer_check		= NULL,

	.apicid_to_node			= es7000_apicid_to_node,

	.cpu_to_logical_apicid		= es7000_cpu_to_logical_apicid,

	.cpu_present_to_apicid		= es7000_cpu_present_to_apicid,

	.apicid_to_cpu_present		= es7000_apicid_to_cpu_present,

	.setup_portio_remap		= NULL,