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

Commit 9f9e3bb1 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Add replacement for cpu_mask_to_apicid() 



As preparation for replacing the vector allocator, provide a new function
which takes a cpu number instead of a cpu mask to calculate/lookup the
resulting APIC destination id.

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>
parent 99a1482d

arch/x86/include/asm/apic.h

+5 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ struct apic { 
	int	(*cpu_mask_to_apicid)(const struct cpumask *cpumask,

				      struct irq_data *irqdata,

				      unsigned int *apicid);

	u32	(*calc_dest_apicid)(unsigned int cpu);



	/* ICR related functions */

	u64	(*icr_read)(void);
@@ -486,6 +487,10 @@ static inline unsigned int read_apic_id(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);



extern u32 apic_default_calc_apicid(unsigned int cpu);

extern u32 apic_flat_calc_apicid(unsigned int cpu);



extern int flat_cpu_mask_to_apicid(const struct cpumask *cpumask,

				   struct irq_data *irqdata,

				   unsigned int *apicid);

arch/x86/kernel/apic/apic_common.c

+10 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ 
#include <linux/irq.h>

#include <asm/apic.h>



u32 apic_default_calc_apicid(unsigned int cpu)

{

	return per_cpu(x86_cpu_to_apicid, cpu);

}



int default_cpu_mask_to_apicid(const struct cpumask *msk, struct irq_data *irqd,

			       unsigned int *apicid)

{
@@ -18,6 +23,11 @@ int default_cpu_mask_to_apicid(const struct cpumask *msk, struct irq_data *irqd, 
	return 0;

}



u32 apic_flat_calc_apicid(unsigned int cpu)

{

	return 1U << cpu;

}



int flat_cpu_mask_to_apicid(const struct cpumask *mask, struct irq_data *irqd,

			    unsigned int *apicid)

arch/x86/kernel/apic/apic_flat_64.c

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



	.cpu_mask_to_apicid		= flat_cpu_mask_to_apicid,

	.calc_dest_apicid		= apic_flat_calc_apicid,



	.send_IPI			= default_send_IPI_single,

	.send_IPI_mask			= flat_send_IPI_mask,
@@ -267,6 +268,7 @@ static struct apic apic_physflat __ro_after_init = { 
	.set_apic_id			= set_apic_id,



	.cpu_mask_to_apicid		= default_cpu_mask_to_apicid,

	.calc_dest_apicid		= apic_default_calc_apicid,



	.send_IPI			= default_send_IPI_single_phys,

	.send_IPI_mask			= default_send_IPI_mask_sequence_phys,

arch/x86/kernel/apic/apic_noop.c

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ struct apic apic_noop __ro_after_init = { 
	.set_apic_id			= NULL,



	.cpu_mask_to_apicid		= flat_cpu_mask_to_apicid,

	.calc_dest_apicid		= apic_flat_calc_apicid,



	.send_IPI			= noop_send_IPI,

	.send_IPI_mask			= noop_send_IPI_mask,

arch/x86/kernel/apic/apic_numachip.c

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ static const struct apic apic_numachip1 __refconst = { 
	.set_apic_id			= numachip1_set_apic_id,



	.cpu_mask_to_apicid		= default_cpu_mask_to_apicid,

	.calc_dest_apicid		= apic_default_calc_apicid,



	.send_IPI			= numachip_send_IPI_one,

	.send_IPI_mask			= numachip_send_IPI_mask,
@@ -317,6 +318,7 @@ static const struct apic apic_numachip2 __refconst = { 
	.set_apic_id			= numachip2_set_apic_id,



	.cpu_mask_to_apicid		= default_cpu_mask_to_apicid,

	.calc_dest_apicid		= apic_default_calc_apicid,



	.send_IPI			= numachip_send_IPI_one,

	.send_IPI_mask			= numachip_send_IPI_mask,