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

Commit 373dd7a2 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86, io_apic: Introduce set_affinity function pointer 



With interrupt remapping a special function is used to
change the affinity of an IO-APIC interrupt. Abstract this
with a function pointer.

Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
Acked-by: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 5afba62c

arch/x86/include/asm/io_apic.h

+4 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ extern void native_io_apic_modify(unsigned int apic, unsigned int reg, unsigned 
extern void native_disable_io_apic(void);

extern void native_io_apic_print_entries(unsigned int apic, unsigned int nr_entries);

extern void intel_ir_io_apic_print_entries(unsigned int apic, unsigned int nr_entries);

extern int native_ioapic_set_affinity(struct irq_data *,

				      const struct cpumask *,

				      bool);



static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg)

{
@@ -228,6 +231,7 @@ static inline void disable_ioapic_support(void) { } 
#define native_io_apic_modify		NULL

#define native_disable_io_apic		NULL

#define native_io_apic_print_entries	NULL

#define native_ioapic_set_affinity	NULL

#endif



#endif /* _ASM_X86_IO_APIC_H */

arch/x86/include/asm/irq_remapping.h

+0 −9
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ extern int setup_ioapic_remapped_entry(int irq, 
				       unsigned int destination,

				       int vector,

				       struct io_apic_irq_attr *attr);

extern int set_remapped_irq_affinity(struct irq_data *data,

				     const struct cpumask *mask,

				     bool force);

extern void free_remapped_irq(int irq);

extern void compose_remapped_msi_msg(struct pci_dev *pdev,

				     unsigned int irq, unsigned int dest,
@@ -68,12 +65,6 @@ static inline int setup_ioapic_remapped_entry(int irq, 
{

	return -ENODEV;

}

static inline int set_remapped_irq_affinity(struct irq_data *data,

					    const struct cpumask *mask,

					    bool force)

{

	return 0;

}

static inline void free_remapped_irq(int irq) { }

static inline void compose_remapped_msi_msg(struct pci_dev *pdev,

					    unsigned int irq, unsigned int dest,

arch/x86/include/asm/x86_init.h

+6 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ struct x86_msi_ops { 
	int  (*setup_hpet_msi)(unsigned int irq, unsigned int id);

};



struct irq_data;

struct cpumask;



struct x86_io_apic_ops {

	void		(*init)   (void);

	unsigned int	(*read)   (unsigned int apic, unsigned int reg);
@@ -197,6 +200,9 @@ struct x86_io_apic_ops { 
	void		(*modify) (unsigned int apic, unsigned int reg, unsigned int value);

	void		(*disable)(void);

	void		(*print_entries)(unsigned int apic, unsigned int nr_entries);

	int		(*set_affinity)(struct irq_data *data,

					const struct cpumask *mask,

					bool force);

};



extern struct x86_init_ops x86_init;

arch/x86/kernel/apic/io_apic.c

+7 −10
Original line number Diff line number Diff line
@@ -2369,8 +2369,9 @@ int __ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask, 
	return 0;

}



static int

ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask,



int native_ioapic_set_affinity(struct irq_data *data,

			       const struct cpumask *mask,

			       bool force)

{

	unsigned int dest, irq = data->irq;
@@ -2570,8 +2571,7 @@ static void irq_remap_modify_chip_defaults(struct irq_chip *chip) 
	chip->irq_print_chip = ir_print_prefix;

	chip->irq_ack = ir_ack_apic_edge;

	chip->irq_eoi = ir_ack_apic_level;



	chip->irq_set_affinity = set_remapped_irq_affinity;

	chip->irq_set_affinity = x86_io_apic_ops.set_affinity;

}

#endif /* CONFIG_IRQ_REMAP */
@@ -2582,7 +2582,7 @@ static struct irq_chip ioapic_chip __read_mostly = { 
	.irq_unmask		= unmask_ioapic_irq,

	.irq_ack		= ack_apic_edge,

	.irq_eoi		= ack_apic_level,

	.irq_set_affinity	= ioapic_set_affinity,

	.irq_set_affinity	= native_ioapic_set_affinity,

	.irq_retrigger		= ioapic_retrigger_irq,

};
@@ -3694,10 +3694,7 @@ void __init setup_ioapic_dest(void) 
		else

			mask = apic->target_cpus();



		if (irq_remapping_enabled)

			set_remapped_irq_affinity(idata, mask, false);

		else

			ioapic_set_affinity(idata, mask, false);

		x86_io_apic_ops.set_affinity(idata, mask, false);

	}



}

arch/x86/kernel/x86_init.c

+1 −0
Original line number Diff line number Diff line
@@ -126,4 +126,5 @@ struct x86_io_apic_ops x86_io_apic_ops = { 
	.modify			= native_io_apic_modify,

	.disable		= native_disable_io_apic,

	.print_entries		= native_io_apic_print_entries,

	.set_affinity		= native_ioapic_set_affinity,

};