Implement irq_chip.irq_write_msi_msg for MSI/DMAR/HPET irq_chips, they will be used to share common code later.
Signed-off-by: Jiang Liu <[email protected]> --- arch/x86/kernel/apic/msi.c | 14 ++++++++++++++ drivers/pci/msi.c | 15 +++++++++++++-- include/linux/msi.h | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 0b2261fe6adf..842d71699912 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -65,6 +65,7 @@ static struct irq_chip msi_chip = { .irq_set_affinity = msi_domain_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, .irq_compose_msi_msg = msi_compose_msg, + .irq_write_msi_msg = pci_msi_write_msg, .flags = IRQCHIP_SKIP_SET_WAKE, }; @@ -128,6 +129,7 @@ static struct irq_chip msi_ir_chip = { .irq_ack = irq_chip_ack_parent, .irq_set_affinity = msi_domain_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, + .irq_write_msi_msg = pci_msi_write_msg, .flags = IRQCHIP_SKIP_SET_WAKE, }; @@ -155,6 +157,11 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask, return ret; } +static void dmar_msi_write_msg(struct irq_data *data, struct msi_msg *msg) +{ + dmar_msi_write(data->irq, msg); +} + static struct irq_chip dmar_msi_type = { .name = "DMAR-MSI", .irq_unmask = dmar_msi_unmask, @@ -163,6 +170,7 @@ static struct irq_chip dmar_msi_type = { .irq_set_affinity = dmar_msi_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, .irq_compose_msi_msg = msi_compose_msg, + .irq_write_msi_msg = dmar_msi_write_msg, .flags = IRQCHIP_SKIP_SET_WAKE, }; @@ -285,6 +293,11 @@ static int hpet_msi_set_affinity(struct irq_data *data, return ret; } +static void hpet_msi_write_msg(struct irq_data *data, struct msi_msg *msg) +{ + hpet_msi_write(data->handler_data, msg); +} + static struct irq_chip hpet_msi_type = { .name = "HPET-MSI", .irq_unmask = hpet_msi_unmask, @@ -293,6 +306,7 @@ static struct irq_chip hpet_msi_type = { .irq_set_affinity = hpet_msi_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, .irq_compose_msi_msg = msi_compose_msg, + .irq_write_msi_msg = hpet_msi_write_msg, .flags = IRQCHIP_SKIP_SET_WAKE, }; diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 49a8bd37189d..b811739b43c5 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1117,6 +1117,18 @@ int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, return ret; } +void pci_msi_write_msg(struct irq_data *irq_data, struct msi_msg *msg) +{ + struct msi_desc *desc = irq_data->msi_desc; + + /* + * MSI-X message is written per-IRQ. + * MSI message denotes a contiguous group of IRQs, written for 0th IRQ. + */ + if (desc->irq == irq_data->irq) + __write_msi_msg(desc, msg); +} + /* * Generate a unique ID number for each possible MSI source, the ID number * is only used within the irqdomain. @@ -1144,8 +1156,7 @@ static int msi_domain_alloc(struct irq_domain *domain, unsigned int virq, for (i = 0; i < nr_irqs; i++) { irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i, - domain->host_data, - (void *)(long)i); + domain->host_data, NULL); __irq_set_handler(virq + i, handle_edge_irq, 0, "edge"); } diff --git a/include/linux/msi.h b/include/linux/msi.h index daea96489a39..312197f64070 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -84,6 +84,7 @@ int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, struct irq_domain *msi_create_irq_domain(struct device_node *of_node, struct irq_chip *chip, struct irq_domain *parent); +void pci_msi_write_msg(struct irq_data *irq_data, struct msi_msg *msg); int msi_irq_domain_alloc_irqs(struct irq_domain *domain, int type, struct pci_dev *dev, void *arg); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
