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

Commit c1d1ee9a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Get rid of apic->target_cpus 



The target_cpus() callback of the apic struct is not really useful. Some
APICs return cpu_online_mask and others cpus_all_mask. The latter is bogus
as it does not take holes in the cpus_possible_mask into account.

Replace it with cpus_online_mask which makes the most sense and remove the
callback.

The usage sites will be removed in a later step anyway, so get rid of it
now to have incremental changes.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Tested-by: default avatarYu Chen <yu.c.chen@intel.com>
Acked-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Alok Kataria <akataria@vmware.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Rui Zhang <rui.zhang@intel.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Len Brown <lenb@kernel.org>
Link: https://lkml.kernel.org/r/20170913213154.070850916@linutronix.de
parent 023a6117

arch/x86/include/asm/apic.h

+0 −3
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ struct apic { 
	u32	irq_dest_mode;



	/* Functions and data related to vector allocation */

	const struct cpumask *(*target_cpus)(void);

	void	(*vector_allocation_domain)(int cpu, struct cpumask *retmask,

					    const struct cpumask *mask);

	int	(*cpu_mask_to_apicid)(const struct cpumask *cpumask,
@@ -484,8 +483,6 @@ static inline unsigned int read_apic_id(void) 
	return apic->get_apic_id(reg);

}



extern const struct cpumask *default_target_cpus(void);

extern const struct cpumask *online_target_cpus(void);

extern int default_apic_id_valid(int apicid);

extern int default_acpi_madt_oem_check(char *, char *);

extern void default_setup_apic_routing(void);

arch/x86/kernel/apic/apic_common.c

+0 −14
Original line number Diff line number Diff line
@@ -78,20 +78,6 @@ int default_check_phys_apicid_present(int phys_apicid) 
	return physid_isset(phys_apicid, phys_cpu_present_map);

}



const struct cpumask *default_target_cpus(void)

{

#ifdef CONFIG_SMP

	return cpu_online_mask;

#else

	return cpumask_of(0);

#endif

}



const struct cpumask *online_target_cpus(void)

{

	return cpu_online_mask;

}



int default_apic_id_valid(int apicid)

{

	return (apicid < 255);

arch/x86/kernel/apic/apic_flat_64.c

+0 −2
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static struct apic apic_flat __ro_after_init = { 
	.irq_delivery_mode		= dest_LowestPrio,

	.irq_dest_mode			= 1, /* logical */



	.target_cpus			= online_target_cpus,

	.disable_esr			= 0,

	.dest_logical			= APIC_DEST_LOGICAL,

	.check_apicid_used		= NULL,
@@ -249,7 +248,6 @@ static struct apic apic_physflat __ro_after_init = { 
	.irq_delivery_mode		= dest_Fixed,

	.irq_dest_mode			= 0, /* physical */



	.target_cpus			= online_target_cpus,

	.disable_esr			= 0,

	.dest_logical			= 0,

	.check_apicid_used		= NULL,

arch/x86/kernel/apic/apic_noop.c

+0 −7
Original line number Diff line number Diff line
@@ -83,12 +83,6 @@ static int noop_apic_id_registered(void) 
	return physid_isset(0, phys_cpu_present_map);

}



static const struct cpumask *noop_target_cpus(void)

{

	/* only BSP here */

	return cpumask_of(0);

}



static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask,

					  const struct cpumask *mask)

{
@@ -127,7 +121,6 @@ struct apic apic_noop __ro_after_init = { 
	/* logical delivery broadcast to all CPUs: */

	.irq_dest_mode			= 1,



	.target_cpus			= noop_target_cpus,

	.disable_esr			= 0,

	.dest_logical			= APIC_DEST_LOGICAL,

	.check_apicid_used		= default_check_apicid_used,

arch/x86/kernel/apic/apic_numachip.c

+0 −2
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ static const struct apic apic_numachip1 __refconst = { 
	.irq_delivery_mode		= dest_Fixed,

	.irq_dest_mode			= 0, /* physical */



	.target_cpus			= online_target_cpus,

	.disable_esr			= 0,

	.dest_logical			= 0,

	.check_apicid_used		= NULL,
@@ -300,7 +299,6 @@ static const struct apic apic_numachip2 __refconst = { 
	.irq_delivery_mode		= dest_Fixed,

	.irq_dest_mode			= 0, /* physical */



	.target_cpus			= online_target_cpus,

	.disable_esr			= 0,

	.dest_logical			= 0,

	.check_apicid_used		= NULL,