PCI: rcar-host: 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]
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
[bhelgaas: rebase on dev_fwnode() conversion, drop fwnode local var]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/ab4005db0a829549be1f348f6c27be50a2118b5e.1750858083.git.namcao@linutronix.de

diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index 65289a171333cc19dbac71b83ef1f1b64a78b9a0..8b9492e9ae6930d041e483ffe8f303e7e98becc8 100644 (file)
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -243,6 +243,7 @@ config PCIE_RCAR_HOST
        bool "Renesas R-Car PCIe controller (host mode)"
        depends on ARCH_RENESAS || COMPILE_TEST
        depends on PCI_MSI
+       select IRQ_MSI_LIB
        help
          Say Y here if you want PCIe controller support on R-Car SoCs in host
          mode.

diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c
index c32b803a47c7ceb3e164781e9ed1c0e847d91aa8..fe288fd770c493fa70b0ef7d565cae42ed270f8f 100644 (file)
--- a/drivers/pci/controller/pcie-rcar-host.c
+++ b/drivers/pci/controller/pcie-rcar-host.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/irqchip/irq-msi-lib.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -597,30 +598,6 @@ static irqreturn_t rcar_pcie_msi_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static void rcar_msi_top_irq_ack(struct irq_data *d)
-{
-       irq_chip_ack_parent(d);
-}
-
-static void rcar_msi_top_irq_mask(struct irq_data *d)
-{
-       pci_msi_mask_irq(d);
-       irq_chip_mask_parent(d);
-}
-
-static void rcar_msi_top_irq_unmask(struct irq_data *d)
-{
-       pci_msi_unmask_irq(d);
-       irq_chip_unmask_parent(d);
-}
-
-static struct irq_chip rcar_msi_top_chip = {
-       .name           = "PCIe MSI",
-       .irq_ack        = rcar_msi_top_irq_ack,
-       .irq_mask       = rcar_msi_top_irq_mask,
-       .irq_unmask     = rcar_msi_top_irq_unmask,
-};
-
 static void rcar_msi_irq_ack(struct irq_data *d)
 {
        struct rcar_msi *msi = irq_data_get_irq_chip_data(d);
@@ -718,30 +695,36 @@ static const struct irq_domain_ops rcar_msi_domain_ops = {
        .free   = rcar_msi_domain_free,
 };
 
-static struct msi_domain_info rcar_msi_info = {
-       .flags  = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
-                 MSI_FLAG_NO_AFFINITY | MSI_FLAG_MULTI_PCI_MSI,
-       .chip   = &rcar_msi_top_chip,
+#define RCAR_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS      | \
+                                MSI_FLAG_USE_DEF_CHIP_OPS      | \
+                                MSI_FLAG_PCI_MSI_MASK_PARENT   | \
+                                MSI_FLAG_NO_AFFINITY)
+
+#define RCAR_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK       | \
+                                 MSI_FLAG_MULTI_PCI_MSI)
+
+static const struct msi_parent_ops rcar_msi_parent_ops = {
+       .required_flags         = RCAR_MSI_FLAGS_REQUIRED,
+       .supported_flags        = RCAR_MSI_FLAGS_SUPPORTED,
+       .bus_select_token       = DOMAIN_BUS_PCI_MSI,
+       .chip_flags             = MSI_CHIP_FLAG_SET_ACK,
+       .prefix                 = "RCAR-",
+       .init_dev_msi_info      = msi_lib_init_dev_msi_info,
 };
 
 static int rcar_allocate_domains(struct rcar_msi *msi)
 {
        struct rcar_pcie *pcie = &msi_to_host(msi)->pcie;
-       struct fwnode_handle *fwnode = dev_fwnode(pcie->dev);
-       struct irq_domain *parent;
-
-       parent = irq_domain_create_linear(fwnode, INT_PCI_MSI_NR,
-                                         &rcar_msi_domain_ops, msi);
-       if (!parent) {
-               dev_err(pcie->dev, "failed to create IRQ domain\n");
-               return -ENOMEM;
-       }
-       irq_domain_update_bus_token(parent, DOMAIN_BUS_NEXUS);
-
-       msi->domain = pci_msi_create_irq_domain(fwnode, &rcar_msi_info, parent);
+       struct irq_domain_info info = {
+               .fwnode         = dev_fwnode(pcie->dev),
+               .ops            = &rcar_msi_domain_ops,
+               .host_data      = msi,
+               .size           = INT_PCI_MSI_NR,
+       };
+
+       msi->domain = msi_create_parent_irq_domain(&info, &rcar_msi_parent_ops);
        if (!msi->domain) {
-               dev_err(pcie->dev, "failed to create MSI domain\n");
-               irq_domain_remove(parent);
+               dev_err(pcie->dev, "failed to create IRQ domain\n");
                return -ENOMEM;
        }
 
@@ -750,10 +733,7 @@ static int rcar_allocate_domains(struct rcar_msi *msi)
 
 static void rcar_free_domains(struct rcar_msi *msi)
 {
-       struct irq_domain *parent = msi->domain->parent;
-
        irq_domain_remove(msi->domain);
-       irq_domain_remove(parent);
 }
 
 static int rcar_pcie_enable_msi(struct rcar_pcie_host *host)