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

Commit debccb3e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: refactor ->cpu_mask_to_apicid*() 



- spread out the namespace on a per driver basis

 - clean up the functions

 - get rid of macros

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 94af1875

arch/x86/include/asm/bigsmp/apic.h

+7 −10
Original line number Diff line number Diff line
@@ -105,17 +105,13 @@ static inline int bigsmp_check_phys_apicid_present(int boot_cpu_physical_apicid) 
}



/* As we are using single CPU as destination, pick only one CPU here */

static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask)

static inline unsigned int bigsmp_cpu_mask_to_apicid(const cpumask_t *cpumask)

{

	int cpu;

	int apicid;	



	cpu = first_cpu(*cpumask);

	apicid = bigsmp_cpu_to_logical_apicid(cpu);

	return apicid;

	return bigsmp_cpu_to_logical_apicid(first_cpu(*cpumask));

}



static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask,

static inline unsigned int

bigsmp_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

			      const struct cpumask *andmask)

{

	int cpu;
@@ -124,9 +120,10 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, 
	 * 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)

	for_each_cpu_and(cpu, cpumask, andmask) {

		if (cpumask_test_cpu(cpu, cpu_online_mask))

			break;

	}

	if (cpu < nr_cpu_ids)

		return bigsmp_cpu_to_logical_apicid(cpu);

arch/x86/include/asm/es7000/apic.h

+18 −11
Original line number Diff line number Diff line
@@ -137,12 +137,12 @@ static inline int es7000_check_phys_apicid_present(int cpu_physical_apicid) 
}



static inline unsigned int

cpu_mask_to_apicid_cluster(const struct cpumask *cpumask)

es7000_cpu_mask_to_apicid_cluster(const struct cpumask *cpumask)

{

	int num_bits_set;

	int cpus_found = 0;

	int cpu;

	int num_bits_set;

	int apicid;

	int cpu;



	num_bits_set = cpumask_weight(cpumask);

	/* Return id to all */
@@ -154,12 +154,15 @@ cpu_mask_to_apicid_cluster(const struct cpumask *cpumask) 
	 */

	cpu = cpumask_first(cpumask);

	apicid = es7000_cpu_to_logical_apicid(cpu);



	while (cpus_found < num_bits_set) {

		if (cpumask_test_cpu(cpu, cpumask)) {

			int new_apicid = es7000_cpu_to_logical_apicid(cpu);



			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)) {

				printk ("%s: Not a valid mask!\n", __func__);



				return 0xFF;

			}

			apicid = new_apicid;
@@ -170,12 +173,12 @@ cpu_mask_to_apicid_cluster(const struct cpumask *cpumask) 
	return apicid;

}



static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask)

static inline unsigned int es7000_cpu_mask_to_apicid(const cpumask_t *cpumask)

{

	int num_bits_set;

	int cpus_found = 0;

	int cpu;

	int num_bits_set;

	int apicid;

	int cpu;



	num_bits_set = cpus_weight(*cpumask);

	/* Return id to all */
@@ -190,9 +193,11 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 
	while (cpus_found < num_bits_set) {

		if (cpu_isset(cpu, *cpumask)) {

			int new_apicid = es7000_cpu_to_logical_apicid(cpu);



			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)) {

				printk ("%s: Not a valid mask!\n", __func__);



				return es7000_cpu_to_logical_apicid(0);

			}

			apicid = new_apicid;
@@ -204,7 +209,8 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 
}





static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask,

static inline unsigned int

es7000_cpu_mask_to_apicid_and(const struct cpumask *inmask,

			      const struct cpumask *andmask)

{

	int apicid = es7000_cpu_to_logical_apicid(0);
@@ -215,9 +221,10 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask, 


	cpumask_and(cpumask, inmask, andmask);

	cpumask_and(cpumask, cpumask, cpu_online_mask);

	apicid = cpu_mask_to_apicid(cpumask);

	apicid = es7000_cpu_mask_to_apicid(cpumask);



	free_cpumask_var(cpumask);



	return apicid;

}

arch/x86/include/asm/mach-default/mach_apic.h

+5 −5
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ static inline const struct cpumask *default_target_cpus(void) 


#ifdef CONFIG_X86_64

#include <asm/genapic.h>

#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)

#define read_apic_id()  (apic->get_apic_id(apic_read(APIC_ID)))

#define send_IPI_self (apic->send_IPI_self)

#define wakeup_secondary_cpu (apic->wakeup_cpu)
@@ -49,12 +47,14 @@ static inline int default_apic_id_registered(void) 
	return physid_isset(read_apic_id(), phys_cpu_present_map);

}



static inline unsigned int cpu_mask_to_apicid(const struct cpumask *cpumask)

static inline unsigned int

default_cpu_mask_to_apicid(const struct cpumask *cpumask)

{

	return cpumask_bits(cpumask)[0];

}



static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask,

static inline unsigned int

default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

			       const struct cpumask *andmask)

{

	unsigned long mask1 = cpumask_bits(cpumask)[0];

arch/x86/include/asm/mach-generic/mach_apic.h

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 


#include <asm/genapic.h>



#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)

#define wakeup_secondary_cpu (apic->wakeup_cpu)



extern void generic_bigsmp_probe(void);

arch/x86/include/asm/numaq/apic.h

+6 −5
Original line number Diff line number Diff line
@@ -101,15 +101,16 @@ static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid) 
 * We use physical apicids here, not logical, so just return the default

 * physical broadcast to stop people from breaking us

 */

static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask)

static inline unsigned int numaq_cpu_mask_to_apicid(const cpumask_t *cpumask)

{

	return (int) 0xF;

	return 0x0F;

}



static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask,

static inline unsigned int

numaq_cpu_mask_to_apicid_and(const struct cpumask *cpumask,

			     const struct cpumask *andmask)

{

	return (int) 0xF;

	return 0x0F;

}



/* No NUMA-Q box has a HT CPU, but it can't hurt to use the default code. */