x86/apic: Factor out default vector_allocation_domain() operation (9d8e1066) · Commits · e / devices / android_kernel_sony_msm8994

arch/x86/include/asm/apic.h

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -615,6 +615,27 @@ extern unsigned int
	default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,		default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
	const struct cpumask *andmask);		const struct cpumask *andmask);

			static inline void
			flat_vector_allocation_domain(int cpu, struct cpumask *retmask)
			{
			/* Careful. Some cpus do not strictly honor the set of cpus
			* specified in the interrupt destination when using lowest
			* priority interrupt delivery mode.
			*
			* In particular there was a hyperthreading cpu observed to
			* deliver interrupts to the wrong hyperthread when only one
			* hyperthread was specified in the interrupt desitination.
			*/
			cpumask_clear(retmask);
			cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
			}

			static inline void
			default_vector_allocation_domain(int cpu, struct cpumask *retmask)
			{
			cpumask_copy(retmask, cpumask_of(cpu));
			}

	static inline unsigned long default_check_apicid_used(physid_mask_t *map, int apicid)		static inline unsigned long default_check_apicid_used(physid_mask_t *map, int apicid)
	{		{
	return physid_isset(apicid, *map);		return physid_isset(apicid, *map);

arch/x86/kernel/apic/apic_flat_64.c

+1 −21

Original line number	Original line	Diff line number	Diff line
	@@ -36,20 +36,6 @@ static int flat_acpi_madt_oem_check(char oem_id, char oem_table_id)
	return 1;		return 1;
	}		}

	static void flat_vector_allocation_domain(int cpu, struct cpumask *retmask)
	{
	/* Careful. Some cpus do not strictly honor the set of cpus
	* specified in the interrupt destination when using lowest
	* priority interrupt delivery mode.
	*
	* In particular there was a hyperthreading cpu observed to
	* deliver interrupts to the wrong hyperthread when only one
	* hyperthread was specified in the interrupt desitination.
	*/
	cpumask_clear(retmask);
	cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
	}

	/*		/*
	* Set up the logical destination ID.		* Set up the logical destination ID.
	*		*
	@@ -257,12 +243,6 @@ static int physflat_acpi_madt_oem_check(char oem_id, char oem_table_id)
	return 0;		return 0;
	}		}

	static void physflat_vector_allocation_domain(int cpu, struct cpumask *retmask)
	{
	cpumask_clear(retmask);
	cpumask_set_cpu(cpu, retmask);
	}

	static void physflat_send_IPI_mask(const struct cpumask *cpumask, int vector)		static void physflat_send_IPI_mask(const struct cpumask *cpumask, int vector)
	{		{
	default_send_IPI_mask_sequence_phys(cpumask, vector);		default_send_IPI_mask_sequence_phys(cpumask, vector);
	@@ -309,7 +289,7 @@ static struct apic apic_physflat = {
	.check_apicid_used = NULL,		.check_apicid_used = NULL,
	.check_apicid_present = NULL,		.check_apicid_present = NULL,

	.vector_allocation_domain = physflat_vector_allocation_domain,		.vector_allocation_domain = default_vector_allocation_domain,
	/* not needed, but shouldn't hurt: */		/* not needed, but shouldn't hurt: */
	.init_apic_ldr = flat_init_apic_ldr,		.init_apic_ldr = flat_init_apic_ldr,

arch/x86/kernel/apic/apic_noop.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -104,8 +104,7 @@ static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask)
	{		{
	if (cpu != 0)		if (cpu != 0)
	pr_warning("APIC: Vector allocated for non-BSP cpu\n");		pr_warning("APIC: Vector allocated for non-BSP cpu\n");
	cpumask_clear(retmask);		cpumask_copy(retmask, cpumask_of(cpu));
	cpumask_set_cpu(cpu, retmask);
	}		}

	static u32 noop_apic_read(u32 reg)		static u32 noop_apic_read(u32 reg)

arch/x86/kernel/apic/apic_numachip.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -72,12 +72,6 @@ static int numachip_phys_pkg_id(int initial_apic_id, int index_msb)
	return initial_apic_id >> index_msb;		return initial_apic_id >> index_msb;
	}		}

	static void numachip_vector_allocation_domain(int cpu, struct cpumask *retmask)
	{
	cpumask_clear(retmask);
	cpumask_set_cpu(cpu, retmask);
	}

	static int __cpuinit numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)		static int __cpuinit numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)
	{		{
	union numachip_csr_g3_ext_irq_gen int_gen;		union numachip_csr_g3_ext_irq_gen int_gen;
	@@ -222,7 +216,7 @@ static struct apic apic_numachip __refconst = {
	.check_apicid_used = NULL,		.check_apicid_used = NULL,
	.check_apicid_present = NULL,		.check_apicid_present = NULL,

	.vector_allocation_domain = numachip_vector_allocation_domain,		.vector_allocation_domain = default_vector_allocation_domain,
	.init_apic_ldr = flat_init_apic_ldr,		.init_apic_ldr = flat_init_apic_ldr,

	.ioapic_phys_id_map = NULL,		.ioapic_phys_id_map = NULL,

arch/x86/kernel/apic/bigsmp_32.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -142,12 +142,6 @@ static const struct dmi_system_id bigsmp_dmi_table[] = {
	{ } /* NULL entry stops DMI scanning */		{ } /* NULL entry stops DMI scanning */
	};		};

	static void bigsmp_vector_allocation_domain(int cpu, struct cpumask *retmask)
	{
	cpumask_clear(retmask);
	cpumask_set_cpu(cpu, retmask);
	}

	static int probe_bigsmp(void)		static int probe_bigsmp(void)
	{		{
	if (def_to_bigsmp)		if (def_to_bigsmp)
	@@ -176,7 +170,7 @@ static struct apic apic_bigsmp = {
	.check_apicid_used = bigsmp_check_apicid_used,		.check_apicid_used = bigsmp_check_apicid_used,
	.check_apicid_present = bigsmp_check_apicid_present,		.check_apicid_present = bigsmp_check_apicid_present,

	.vector_allocation_domain = bigsmp_vector_allocation_domain,		.vector_allocation_domain = default_vector_allocation_domain,
	.init_apic_ldr = bigsmp_init_apic_ldr,		.init_apic_ldr = bigsmp_init_apic_ldr,

	.ioapic_phys_id_map = bigsmp_ioapic_phys_id_map,		.ioapic_phys_id_map = bigsmp_ioapic_phys_id_map,