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

Commit da165322 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86, io_apic: Introduce eoi_ioapic_pin call-back 



This callback replaces the old __eoi_ioapic_pin function
which needs a special path for interrupt remapping.

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 7601384f

arch/x86/include/asm/io_apic.h

+5 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ extern void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg); 
extern void native_compose_msi_msg(struct pci_dev *pdev,

				   unsigned int irq, unsigned int dest,

				   struct msi_msg *msg, u8 hpet_id);

extern void native_eoi_ioapic_pin(int apic, int pin, int vector);

int io_apic_setup_irq_pin_once(unsigned int irq, int node, struct io_apic_irq_attr *attr);



extern int save_ioapic_entries(void);
@@ -211,6 +212,9 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned 
{

	x86_io_apic_ops.modify(apic, reg, value);

}



extern void io_apic_eoi(unsigned int apic, unsigned int vector);



#else  /* !CONFIG_X86_IO_APIC */



#define io_apic_assign_pci_irqs 0
@@ -246,6 +250,7 @@ static inline void disable_ioapic_support(void) { } 
#define native_ioapic_set_affinity	NULL

#define native_setup_ioapic_entry	NULL

#define native_compose_msi_msg		NULL

#define native_eoi_ioapic_pin		NULL

#endif



#endif /* _ASM_X86_IO_APIC_H */

arch/x86/include/asm/x86_init.h

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ struct x86_io_apic_ops { 
	int		(*setup_entry)(int irq, struct IO_APIC_route_entry *entry,

				       unsigned int destination, int vector,

				       struct io_apic_irq_attr *attr);

	void		(*eoi_ioapic_pin)(int apic, int pin, int vector);

};



extern struct x86_init_ops x86_init;

arch/x86/kernel/apic/io_apic.c

+6 −14
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static __attribute_const__ struct io_apic __iomem *io_apic_base(int idx) 
		+ (mpc_ioapic_addr(idx) & ~PAGE_MASK);

}



static inline void io_apic_eoi(unsigned int apic, unsigned int vector)

void io_apic_eoi(unsigned int apic, unsigned int vector)

{

	struct io_apic __iomem *io_apic = io_apic_base(apic);

	writel(vector, &io_apic->eoi);
@@ -557,18 +557,9 @@ static void unmask_ioapic_irq(struct irq_data *data) 
 * Otherwise, we simulate the EOI message manually by changing the trigger

 * mode to edge and then back to level, with RTE being masked during this.

 */

static void __eoi_ioapic_pin(int apic, int pin, int vector, struct irq_cfg *cfg)

void native_eoi_ioapic_pin(int apic, int pin, int vector)

{

	if (mpc_ioapic_ver(apic) >= 0x20) {

		/*

		 * Intr-remapping uses pin number as the virtual vector

		 * in the RTE. Actual vector is programmed in

		 * intr-remapping table entry. Hence for the io-apic

		 * EOI we use the pin number.

		 */

		if (cfg && irq_remapped(cfg))

			io_apic_eoi(apic, pin);

		else

		io_apic_eoi(apic, vector);

	} else {

		struct IO_APIC_route_entry entry, entry1;
@@ -597,7 +588,8 @@ void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg) 


	raw_spin_lock_irqsave(&ioapic_lock, flags);

	for_each_irq_pin(entry, cfg->irq_2_pin)

		__eoi_ioapic_pin(entry->apic, entry->pin, cfg->vector, cfg);

		x86_io_apic_ops.eoi_ioapic_pin(entry->apic, entry->pin,

					       cfg->vector);

	raw_spin_unlock_irqrestore(&ioapic_lock, flags);

}
@@ -634,7 +626,7 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) 
		}



		raw_spin_lock_irqsave(&ioapic_lock, flags);

		__eoi_ioapic_pin(apic, pin, entry.vector, NULL);

		x86_io_apic_ops.eoi_ioapic_pin(apic, pin, entry.vector);

		raw_spin_unlock_irqrestore(&ioapic_lock, flags);

	}

arch/x86/kernel/x86_init.c

+1 −0
Original line number Diff line number Diff line
@@ -129,4 +129,5 @@ struct x86_io_apic_ops x86_io_apic_ops = { 
	.print_entries		= native_io_apic_print_entries,

	.set_affinity		= native_ioapic_set_affinity,

	.setup_entry		= native_setup_ioapic_entry,

	.eoi_ioapic_pin		= native_eoi_ioapic_pin,

};

drivers/iommu/irq_remapping.c

+12 −0
Original line number Diff line number Diff line
@@ -143,11 +143,23 @@ static int irq_remapping_setup_msi_irqs(struct pci_dev *dev, 
		return do_setup_msix_irqs(dev, nvec);

}



void eoi_ioapic_pin_remapped(int apic, int pin, int vector)

{

	/*

	 * Intr-remapping uses pin number as the virtual vector

	 * in the RTE. Actual vector is programmed in

	 * intr-remapping table entry. Hence for the io-apic

	 * EOI we use the pin number.

	 */

	io_apic_eoi(apic, pin);

}



static void __init irq_remapping_modify_x86_ops(void)

{

	x86_io_apic_ops.disable		= irq_remapping_disable_io_apic;

	x86_io_apic_ops.set_affinity	= set_remapped_irq_affinity;

	x86_io_apic_ops.setup_entry	= setup_ioapic_remapped_entry;

	x86_io_apic_ops.eoi_ioapic_pin	= eoi_ioapic_pin_remapped;

	x86_msi.setup_msi_irqs		= irq_remapping_setup_msi_irqs;

	x86_msi.setup_hpet_msi		= setup_hpet_msi_remapped;

	x86_msi.compose_msi_msg		= compose_remapped_msi_msg;