irqchip/armada-370-xp: Switch to msi_create_parent_irq_domain()

Move away from the legacy MSI domain setup, switch to use
msi_create_parent_irq_domain().

Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/976892e3ce64fcf52387833abee08ddfa47d2a82.1750860131.git.namcao@linutronix.de

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index d596155b314c2777142edb20719d52eba83d345e..0f195ad49941001ce3c4828c7105f49c3f03851c 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -79,6 +79,7 @@ config ARMADA_370_XP_IRQ
        bool
        select GENERIC_IRQ_CHIP
        select PCI_MSI if PCI
+       select IRQ_MSI_LIB if PCI
        select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
 
 config ALPINE_MSI

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 67b672a78862674cc5a2a58ac1c67ef105697e15..a44c49e985b758cb3b9f8bd2af7fff026479909d 100644 (file)
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -20,6 +20,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip.h>
 #include <linux/irqchip/chained_irq.h>
+#include <linux/irqchip/irq-msi-lib.h>
 #include <linux/cpu.h>
 #include <linux/io.h>
 #include <linux/of_address.h>
@@ -156,7 +157,6 @@
  * @parent_irq:                parent IRQ if MPIC is not top-level interrupt controller
  * @domain:            MPIC main interrupt domain
  * @ipi_domain:                IPI domain
- * @msi_domain:                MSI domain
  * @msi_inner_domain:  MSI inner domain
  * @msi_used:          bitmap of used MSI numbers
  * @msi_lock:          mutex serializing access to @msi_used
@@ -176,7 +176,6 @@ struct mpic {
        struct irq_domain *ipi_domain;
 #endif
 #ifdef CONFIG_PCI_MSI
-       struct irq_domain *msi_domain;
        struct irq_domain *msi_inner_domain;
        DECLARE_BITMAP(msi_used, PCI_MSI_FULL_DOORBELL_NR);
        struct mutex msi_lock;
@@ -234,18 +233,6 @@ static void mpic_irq_unmask(struct irq_data *d)
 
 #ifdef CONFIG_PCI_MSI
 
-static struct irq_chip mpic_msi_irq_chip = {
-       .name           = "MPIC MSI",
-       .irq_mask       = pci_msi_mask_irq,
-       .irq_unmask     = pci_msi_unmask_irq,
-};
-
-static struct msi_domain_info mpic_msi_domain_info = {
-       .flags  = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
-                  MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX),
-       .chip   = &mpic_msi_irq_chip,
-};
-
 static void mpic_compose_msi_msg(struct irq_data *d, struct msi_msg *msg)
 {
        unsigned int cpu = cpumask_first(irq_data_get_effective_affinity_mask(d));
@@ -314,6 +301,7 @@ static void mpic_msi_free(struct irq_domain *domain, unsigned int virq, unsigned
 }
 
 static const struct irq_domain_ops mpic_msi_domain_ops = {
+       .select = msi_lib_irq_domain_select,
        .alloc  = mpic_msi_alloc,
        .free   = mpic_msi_free,
 };
@@ -331,6 +319,21 @@ static void mpic_msi_reenable_percpu(struct mpic *mpic)
        writel(1, mpic->per_cpu + MPIC_INT_CLEAR_MASK);
 }
 
+#define MPIC_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \
+                                MSI_FLAG_USE_DEF_CHIP_OPS)
+#define MPIC_MSI_FLAGS_SUPPORTED (MSI_FLAG_MULTI_PCI_MSI  | \
+                                 MSI_FLAG_PCI_MSIX       | \
+                                 MSI_GENERIC_FLAGS_MASK)
+
+static const struct msi_parent_ops mpic_msi_parent_ops = {
+       .required_flags         = MPIC_MSI_FLAGS_REQUIRED,
+       .supported_flags        = MPIC_MSI_FLAGS_SUPPORTED,
+       .bus_select_token       = DOMAIN_BUS_NEXUS,
+       .bus_select_mask        = MATCH_PCI_MSI,
+       .prefix                 = "MPIC-",
+       .init_dev_msi_info      = msi_lib_init_dev_msi_info,
+};
+
 static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,
                                phys_addr_t main_int_phys_base)
 {
@@ -348,17 +351,16 @@ static int __init mpic_msi_init(struct mpic *mpic, struct device_node *node,
                mpic->msi_doorbell_mask = PCI_MSI_FULL_DOORBELL_MASK;
        }
 
-       mpic->msi_inner_domain = irq_domain_create_linear(NULL, mpic->msi_doorbell_size,
-                                                      &mpic_msi_domain_ops, mpic);
-       if (!mpic->msi_inner_domain)
-               return -ENOMEM;
+       struct irq_domain_info info = {
+               .fwnode         = of_fwnode_handle(node),
+               .ops            = &mpic_msi_domain_ops,
+               .host_data      = mpic,
+               .size           = mpic->msi_doorbell_size,
+       };
 
-       mpic->msi_domain = pci_msi_create_irq_domain(of_fwnode_handle(node), &mpic_msi_domain_info,
-                                                    mpic->msi_inner_domain);
-       if (!mpic->msi_domain) {
-               irq_domain_remove(mpic->msi_inner_domain);
+       mpic->msi_inner_domain = msi_create_parent_irq_domain(&info, &mpic_msi_parent_ops);
+       if (!mpic->msi_inner_domain)
                return -ENOMEM;
-       }
 
        mpic_msi_reenable_percpu(mpic);