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

Commit 6398268d authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Ingo Molnar
Browse files

x86/apic: Factor out default cpu_mask_to_apicid() operations 



Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/20120605112340.GA11454@dhcp-26-207.brq.redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bf721d3a

arch/x86/include/asm/apic.h

+10 −3
Original line number Diff line number Diff line
@@ -592,13 +592,13 @@ static inline int default_phys_pkg_id(int cpuid_apic, int index_msb) 
#endif



static inline unsigned int

default_cpu_mask_to_apicid(const struct cpumask *cpumask)

flat_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

	return cpumask_bits(cpumask)[0] & APIC_ALL_CPUS;

}



static inline unsigned int

default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

flat_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

			    const struct cpumask *andmask)

{

	unsigned long mask1 = cpumask_bits(cpumask)[0];
@@ -608,6 +608,13 @@ default_cpu_mask_to_apicid_and(const struct cpumask *cpumask, 
	return (unsigned int)(mask1 & mask2 & mask3);

}



extern unsigned int

default_cpu_mask_to_apicid(const struct cpumask *cpumask);



extern unsigned int

default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

			       const struct cpumask *andmask);



static inline unsigned long default_check_apicid_used(physid_mask_t *map, int apicid)

{

	return physid_isset(apicid, *map);

arch/x86/kernel/apic/apic.c

+28 −0
Original line number Diff line number Diff line
@@ -2123,6 +2123,34 @@ void default_init_apic_ldr(void) 
	apic_write(APIC_LDR, val);

}



unsigned int default_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

	int cpu;



	/*

	 * We're using fixed IRQ delivery, can only return one phys APIC ID.

	 * May as well be the first.

	 */

	cpu = cpumask_first(cpumask);

	if (likely((unsigned)cpu < nr_cpu_ids))

		return per_cpu(x86_cpu_to_apicid, cpu);



	return BAD_APICID;

}



unsigned int

default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

			       const struct cpumask *andmask)

{

	int cpu;



	for_each_cpu_and(cpu, cpumask, andmask) {

		if (cpumask_test_cpu(cpu, cpu_online_mask))

			break;

	}

	return per_cpu(x86_cpu_to_apicid, cpu);

}



/*

 * Power management

 */

arch/x86/kernel/apic/apic_flat_64.c

+4 −36
Original line number Diff line number Diff line
@@ -205,8 +205,8 @@ static struct apic apic_flat = { 
	.set_apic_id			= set_apic_id,

	.apic_id_mask			= 0xFFu << 24,



	.cpu_mask_to_apicid		= default_cpu_mask_to_apicid,

	.cpu_mask_to_apicid_and		= default_cpu_mask_to_apicid_and,

	.cpu_mask_to_apicid		= flat_cpu_mask_to_apicid,

	.cpu_mask_to_apicid_and		= flat_cpu_mask_to_apicid_and,



	.send_IPI_mask			= flat_send_IPI_mask,

	.send_IPI_mask_allbutself	= flat_send_IPI_mask_allbutself,
@@ -284,38 +284,6 @@ static void physflat_send_IPI_all(int vector) 
	physflat_send_IPI_mask(cpu_online_mask, vector);

}



static unsigned int physflat_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

	int cpu;



	/*

	 * We're using fixed IRQ delivery, can only return one phys APIC ID.

	 * May as well be the first.

	 */

	cpu = cpumask_first(cpumask);

	if ((unsigned)cpu < nr_cpu_ids)

		return per_cpu(x86_cpu_to_apicid, cpu);

	else

		return BAD_APICID;

}



static unsigned int

physflat_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

				const struct cpumask *andmask)

{

	int cpu;



	/*

	 * We're using fixed IRQ delivery, can only return one phys APIC ID.

	 * May as well be the first.

	 */

	for_each_cpu_and(cpu, cpumask, andmask) {

		if (cpumask_test_cpu(cpu, cpu_online_mask))

			break;

	}

	return per_cpu(x86_cpu_to_apicid, cpu);

}



static int physflat_probe(void)

{

	if (apic == &apic_physflat || num_possible_cpus() > 8)
@@ -360,8 +328,8 @@ static struct apic apic_physflat = { 
	.set_apic_id			= set_apic_id,

	.apic_id_mask			= 0xFFu << 24,



	.cpu_mask_to_apicid		= physflat_cpu_mask_to_apicid,

	.cpu_mask_to_apicid_and		= physflat_cpu_mask_to_apicid_and,

	.cpu_mask_to_apicid		= default_cpu_mask_to_apicid,

	.cpu_mask_to_apicid_and		= default_cpu_mask_to_apicid_and,



	.send_IPI_mask			= physflat_send_IPI_mask,

	.send_IPI_mask_allbutself	= physflat_send_IPI_mask_allbutself,

arch/x86/kernel/apic/apic_noop.c

+2 −2
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ struct apic apic_noop = { 
	.set_apic_id			= NULL,

	.apic_id_mask			= 0x0F << 24,



	.cpu_mask_to_apicid		= default_cpu_mask_to_apicid,

	.cpu_mask_to_apicid_and		= default_cpu_mask_to_apicid_and,

	.cpu_mask_to_apicid		= flat_cpu_mask_to_apicid,

	.cpu_mask_to_apicid_and		= flat_cpu_mask_to_apicid_and,



	.send_IPI_mask			= noop_send_IPI_mask,

	.send_IPI_mask_allbutself	= noop_send_IPI_mask_allbutself,

arch/x86/kernel/apic/apic_numachip.c

+2 −34
Original line number Diff line number Diff line
@@ -152,38 +152,6 @@ static void numachip_send_IPI_self(int vector) 
	__default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);

}



static unsigned int numachip_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

	int cpu;



	/*

	 * We're using fixed IRQ delivery, can only return one phys APIC ID.

	 * May as well be the first.

	 */

	cpu = cpumask_first(cpumask);

	if (likely((unsigned)cpu < nr_cpu_ids))

		return per_cpu(x86_cpu_to_apicid, cpu);



	return BAD_APICID;

}



static unsigned int

numachip_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

				const struct cpumask *andmask)

{

	int cpu;



	/*

	 * We're using fixed IRQ delivery, can only return one phys APIC ID.

	 * May as well be the first.

	 */

	for_each_cpu_and(cpu, cpumask, andmask) {

		if (cpumask_test_cpu(cpu, cpu_online_mask))

			break;

	}

	return per_cpu(x86_cpu_to_apicid, cpu);

}



static int __init numachip_probe(void)

{

	return apic == &apic_numachip;
@@ -272,8 +240,8 @@ static struct apic apic_numachip __refconst = { 
	.set_apic_id			= set_apic_id,

	.apic_id_mask			= 0xffU << 24,



	.cpu_mask_to_apicid		= numachip_cpu_mask_to_apicid,

	.cpu_mask_to_apicid_and		= numachip_cpu_mask_to_apicid_and,

	.cpu_mask_to_apicid		= default_cpu_mask_to_apicid,

	.cpu_mask_to_apicid_and		= default_cpu_mask_to_apicid_and,



	.send_IPI_mask			= numachip_send_IPI_mask,

	.send_IPI_mask_allbutself	= numachip_send_IPI_mask_allbutself,