PCI: mediatek-gen3: Switch to msi_create_parent_irq_domain()

Switch to msi_create_parent_irq_domain() from pci_msi_create_irq_domain()
which was using legacy MSI domain setup.

Signed-off-by: Nam Cao <namcao@linutronix.de>
[mani: reworded commit message & fixed merge conflict]
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
[bhelgaas: rebase on dev_fwnode() conversion]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/bfbd2e375269071b69e1aa85e629ee4b7c99518f.1750858083.git.namcao@linutronix.de

diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index 375a019f35bd92573faaf5b20a2836508848b03b..ec32c343a751d1b1173b29a646ab983843f12647 100644 (file)
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -203,6 +203,7 @@ config PCIE_MEDIATEK_GEN3
        tristate "MediaTek Gen3 PCIe controller"
        depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST
        depends on PCI_MSI
+       select IRQ_MSI_LIB
        help
          Adds support for PCIe Gen3 MAC controller for MediaTek SoCs.
          This PCIe controller is compatible with Gen3, Gen2 and Gen1 speed,

diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
index 5464b4ae5c20c6c167b172dba598a77af70c6ad2..97147f43e41c58162c0b843f21a9caa0e6ebc268 100644 (file)
--- a/drivers/pci/controller/pcie-mediatek-gen3.c
+++ b/drivers/pci/controller/pcie-mediatek-gen3.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/iopoll.h>
 #include <linux/irq.h>
+#include <linux/irqchip/irq-msi-lib.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
@@ -187,7 +188,6 @@ struct mtk_msi_set {
  * @saved_irq_state: IRQ enable state saved at suspend time
  * @irq_lock: lock protecting IRQ register access
  * @intx_domain: legacy INTx IRQ domain
- * @msi_domain: MSI IRQ domain
  * @msi_bottom_domain: MSI IRQ bottom domain
  * @msi_sets: MSI sets information
  * @lock: lock protecting IRQ bit map
@@ -210,7 +210,6 @@ struct mtk_gen3_pcie {
        u32 saved_irq_state;
        raw_spinlock_t irq_lock;
        struct irq_domain *intx_domain;
-       struct irq_domain *msi_domain;
        struct irq_domain *msi_bottom_domain;
        struct mtk_msi_set msi_sets[PCIE_MSI_SET_NUM];
        struct mutex lock;
@@ -526,30 +525,22 @@ static int mtk_pcie_startup_port(struct mtk_gen3_pcie *pcie)
        return 0;
 }
 
-static void mtk_pcie_msi_irq_mask(struct irq_data *data)
-{
-       pci_msi_mask_irq(data);
-       irq_chip_mask_parent(data);
-}
-
-static void mtk_pcie_msi_irq_unmask(struct irq_data *data)
-{
-       pci_msi_unmask_irq(data);
-       irq_chip_unmask_parent(data);
-}
-
-static struct irq_chip mtk_msi_irq_chip = {
-       .irq_ack = irq_chip_ack_parent,
-       .irq_mask = mtk_pcie_msi_irq_mask,
-       .irq_unmask = mtk_pcie_msi_irq_unmask,
-       .name = "MSI",
-};
-
-static struct msi_domain_info mtk_msi_domain_info = {
-       .flags  = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
-                 MSI_FLAG_NO_AFFINITY | MSI_FLAG_PCI_MSIX |
-                 MSI_FLAG_MULTI_PCI_MSI,
-       .chip   = &mtk_msi_irq_chip,
+#define MTK_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS       | \
+                               MSI_FLAG_USE_DEF_CHIP_OPS       | \
+                               MSI_FLAG_NO_AFFINITY            | \
+                               MSI_FLAG_PCI_MSI_MASK_PARENT)
+
+#define MTK_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK                | \
+                                MSI_FLAG_PCI_MSIX              | \
+                                MSI_FLAG_MULTI_PCI_MSI)
+
+static const struct msi_parent_ops mtk_msi_parent_ops = {
+       .required_flags         = MTK_MSI_FLAGS_REQUIRED,
+       .supported_flags        = MTK_MSI_FLAGS_SUPPORTED,
+       .bus_select_token       = DOMAIN_BUS_PCI_MSI,
+       .chip_flags             = MSI_CHIP_FLAG_SET_ACK,
+       .prefix                 = "MTK3-",
+       .init_dev_msi_info      = msi_lib_init_dev_msi_info,
 };
 
 static void mtk_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
@@ -756,28 +747,23 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie)
        /* Setup MSI */
        mutex_init(&pcie->lock);
 
-       pcie->msi_bottom_domain = irq_domain_create_linear(dev_fwnode(dev), PCIE_MSI_IRQS_NUM,
-                                                          &mtk_msi_bottom_domain_ops, pcie);
+       struct irq_domain_info info = {
+               .fwnode         = dev_fwnode(dev),
+               .ops            = &mtk_msi_bottom_domain_ops,
+               .host_data      = pcie,
+               .size           = PCIE_MSI_IRQS_NUM,
+       };
+
+       pcie->msi_bottom_domain = msi_create_parent_irq_domain(&info, &mtk_msi_parent_ops);
        if (!pcie->msi_bottom_domain) {
                dev_err(dev, "failed to create MSI bottom domain\n");
                ret = -ENODEV;
                goto err_msi_bottom_domain;
        }
 
-       pcie->msi_domain = pci_msi_create_irq_domain(dev->fwnode,
-                                                    &mtk_msi_domain_info,
-                                                    pcie->msi_bottom_domain);
-       if (!pcie->msi_domain) {
-               dev_err(dev, "failed to create MSI domain\n");
-               ret = -ENODEV;
-               goto err_msi_domain;
-       }
-
        of_node_put(intc_node);
        return 0;
 
-err_msi_domain:
-       irq_domain_remove(pcie->msi_bottom_domain);
 err_msi_bottom_domain:
        irq_domain_remove(pcie->intx_domain);
 out_put_node:
@@ -792,9 +778,6 @@ static void mtk_pcie_irq_teardown(struct mtk_gen3_pcie *pcie)
        if (pcie->intx_domain)
                irq_domain_remove(pcie->intx_domain);
 
-       if (pcie->msi_domain)
-               irq_domain_remove(pcie->msi_domain);
-
        if (pcie->msi_bottom_domain)
                irq_domain_remove(pcie->msi_bottom_domain);