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

Commit 7601384f authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86, msi: Introduce x86_msi.compose_msi_msg call-back 



This call-back points to the right function for initializing
the msi_msg structure. The old code for msi_msg generation
was split up into the irq-remapped and the default case.

The irq-remapped case just calls into the specific Intel or
AMD implementation when the device is behind an IOMMU.
Otherwise the default function is called.

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 2976fd84

arch/x86/include/asm/io_apic.h

+4 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ extern int native_setup_ioapic_entry(int, struct IO_APIC_route_entry *, 
				     struct io_apic_irq_attr *);

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);

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



extern int save_ioapic_entries(void);
@@ -242,6 +245,7 @@ static inline void disable_ioapic_support(void) { } 
#define native_io_apic_print_entries	NULL

#define native_ioapic_set_affinity	NULL

#define native_setup_ioapic_entry	NULL

#define native_compose_msi_msg		NULL

#endif



#endif /* _ASM_X86_IO_APIC_H */

arch/x86/include/asm/x86_init.h

+4 −0
Original line number Diff line number Diff line
@@ -181,9 +181,13 @@ struct x86_platform_ops { 
};



struct pci_dev;

struct msi_msg;



struct x86_msi_ops {

	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);

	void (*compose_msi_msg)(struct pci_dev *dev, unsigned int irq,

				unsigned int dest, struct msi_msg *msg,

			       u8 hpet_id);

	void (*teardown_msi_irq)(unsigned int irq);

	void (*teardown_msi_irqs)(struct pci_dev *dev);

	void (*restore_msi_irqs)(struct pci_dev *dev, int irq);

arch/x86/kernel/apic/io_apic.c

+30 −27
Original line number Diff line number Diff line
@@ -3019,37 +3019,16 @@ void destroy_irqs(unsigned int irq, unsigned int count) 
/*

 * MSI message composition

 */

#ifdef CONFIG_PCI_MSI

static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,

void native_compose_msi_msg(struct pci_dev *pdev,

			    unsigned int irq, unsigned int dest,

			    struct msi_msg *msg, u8 hpet_id)

{

	struct irq_cfg *cfg;

	int err;

	unsigned dest;



	if (disable_apic)

		return -ENXIO;

	struct irq_cfg *cfg = irq_cfg(irq);



	cfg = irq_cfg(irq);

	err = assign_irq_vector(irq, cfg, apic->target_cpus());

	if (err)

		return err;



	err = apic->cpu_mask_to_apicid_and(cfg->domain,

					   apic->target_cpus(), &dest);

	if (err)

		return err;



	if (irq_remapped(cfg)) {

		compose_remapped_msi_msg(pdev, irq, dest, msg, hpet_id);

		return 0;

	}

	msg->address_hi = MSI_ADDR_BASE_HI;



	if (x2apic_enabled())

		msg->address_hi = MSI_ADDR_BASE_HI |

				  MSI_ADDR_EXT_DEST_ID(dest);

	else

		msg->address_hi = MSI_ADDR_BASE_HI;

		msg->address_hi |= MSI_ADDR_EXT_DEST_ID(dest);



	msg->address_lo =

		MSI_ADDR_BASE_LO |
@@ -3068,6 +3047,30 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, 
			MSI_DATA_DELIVERY_FIXED:

			MSI_DATA_DELIVERY_LOWPRI) |

		MSI_DATA_VECTOR(cfg->vector);

}



#ifdef CONFIG_PCI_MSI

static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,

			   struct msi_msg *msg, u8 hpet_id)

{

	struct irq_cfg *cfg;

	int err;

	unsigned dest;



	if (disable_apic)

		return -ENXIO;



	cfg = irq_cfg(irq);

	err = assign_irq_vector(irq, cfg, apic->target_cpus());

	if (err)

		return err;



	err = apic->cpu_mask_to_apicid_and(cfg->domain,

					   apic->target_cpus(), &dest);

	if (err)

		return err;



	x86_msi.compose_msi_msg(pdev, irq, dest, msg, hpet_id);



	return 0;

}

arch/x86/kernel/x86_init.c

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ struct x86_platform_ops x86_platform = { 
EXPORT_SYMBOL_GPL(x86_platform);

struct x86_msi_ops x86_msi = {

	.setup_msi_irqs		= native_setup_msi_irqs,

	.compose_msi_msg	= native_compose_msi_msg,

	.teardown_msi_irq	= native_teardown_msi_irq,

	.teardown_msi_irqs	= default_teardown_msi_irqs,

	.restore_msi_irqs	= default_restore_msi_irqs,

drivers/iommu/irq_remapping.c

+6 −3
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ static void __init irq_remapping_modify_x86_ops(void) 
	x86_io_apic_ops.setup_entry	= setup_ioapic_remapped_entry;

	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;

}



static __init int setup_nointremap(char *str)
@@ -295,9 +296,11 @@ void compose_remapped_msi_msg(struct pci_dev *pdev, 
			      unsigned int irq, unsigned int dest,

			      struct msi_msg *msg, u8 hpet_id)

{

	if (!remap_ops || !remap_ops->compose_msi_msg)

		return;

	struct irq_cfg *cfg = irq_get_chip_data(irq);



	if (!irq_remapped(cfg))

		native_compose_msi_msg(pdev, irq, dest, msg, hpet_id);

	else if (remap_ops && remap_ops->compose_msi_msg)

		remap_ops->compose_msi_msg(pdev, irq, dest, msg, hpet_id);

}