PCI: aardvark: 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]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/68b2f9387bbe4f08bcd428bfab83ad1219fb8d80.1750858083.git.namcao@linutronix.de

diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index 886f6f43a895f8f56ce3bcabbea382b6cd3b15c2..91a2d4ffc3ac4b90327f52fd7a9bf1f5ca2402d7 100644 (file)
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -13,6 +13,7 @@ config PCI_AARDVARK
        depends on OF
        depends on PCI_MSI
        select PCI_BRIDGE_EMUL
+       select IRQ_MSI_LIB
        help
         Add support for Aardvark 64bit PCIe Host Controller. This
         controller is part of the South Bridge of the Marvel Armada

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 7bac64533b1432e4b2ea073eb4094c87e7ccd9bf..e34bea1ff0ac66731b1bca6b54ad051b1bb2a839 100644 (file)
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -13,6 +13,7 @@
 #include <linux/gpio/consumer.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/module.h>
@@ -278,7 +279,6 @@ struct advk_pcie {
        struct irq_domain *irq_domain;
        struct irq_chip irq_chip;
        raw_spinlock_t irq_lock;
-       struct irq_domain *msi_domain;
        struct irq_domain *msi_inner_domain;
        raw_spinlock_t msi_irq_lock;
        DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
@@ -1332,18 +1332,6 @@ static void advk_msi_irq_unmask(struct irq_data *d)
        raw_spin_unlock_irqrestore(&pcie->msi_irq_lock, flags);
 }
 
-static void advk_msi_top_irq_mask(struct irq_data *d)
-{
-       pci_msi_mask_irq(d);
-       irq_chip_mask_parent(d);
-}
-
-static void advk_msi_top_irq_unmask(struct irq_data *d)
-{
-       pci_msi_unmask_irq(d);
-       irq_chip_unmask_parent(d);
-}
-
 static struct irq_chip advk_msi_bottom_irq_chip = {
        .name                   = "MSI",
        .irq_compose_msi_msg    = advk_msi_irq_compose_msi_msg,
@@ -1436,17 +1424,20 @@ static const struct irq_domain_ops advk_pcie_irq_domain_ops = {
        .xlate = irq_domain_xlate_onecell,
 };
 
-static struct irq_chip advk_msi_irq_chip = {
-       .name           = "advk-MSI",
-       .irq_mask       = advk_msi_top_irq_mask,
-       .irq_unmask     = advk_msi_top_irq_unmask,
-};
-
-static struct msi_domain_info advk_msi_domain_info = {
-       .flags  = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
-                 MSI_FLAG_NO_AFFINITY | MSI_FLAG_MULTI_PCI_MSI |
-                 MSI_FLAG_PCI_MSIX,
-       .chip   = &advk_msi_irq_chip,
+#define ADVK_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 ADVK_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK       | \
+                                 MSI_FLAG_PCI_MSIX             | \
+                                 MSI_FLAG_MULTI_PCI_MSI)
+
+static const struct msi_parent_ops advk_msi_parent_ops = {
+       .required_flags         = ADVK_MSI_FLAGS_REQUIRED,
+       .supported_flags        = ADVK_MSI_FLAGS_SUPPORTED,
+       .bus_select_token       = DOMAIN_BUS_PCI_MSI,
+       .prefix                 = "advk-",
+       .init_dev_msi_info      = msi_lib_init_dev_msi_info,
 };
 
 static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
@@ -1456,26 +1447,22 @@ static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
        raw_spin_lock_init(&pcie->msi_irq_lock);
        mutex_init(&pcie->msi_used_lock);
 
-       pcie->msi_inner_domain = irq_domain_create_linear(NULL, MSI_IRQ_NUM,
-                                                         &advk_msi_domain_ops, pcie);
-       if (!pcie->msi_inner_domain)
-               return -ENOMEM;
+       struct irq_domain_info info = {
+               .fwnode         = dev_fwnode(dev),
+               .ops            = &advk_msi_domain_ops,
+               .host_data      = pcie,
+               .size           = MSI_IRQ_NUM,
+       };
 
-       pcie->msi_domain =
-               pci_msi_create_irq_domain(dev_fwnode(dev),
-                                         &advk_msi_domain_info,
-                                         pcie->msi_inner_domain);
-       if (!pcie->msi_domain) {
-               irq_domain_remove(pcie->msi_inner_domain);
+       pcie->msi_inner_domain = msi_create_parent_irq_domain(&info, &advk_msi_parent_ops);
+       if (!pcie->msi_inner_domain)
                return -ENOMEM;
-       }
 
        return 0;
 }
 
 static void advk_pcie_remove_msi_irq_domain(struct advk_pcie *pcie)
 {
-       irq_domain_remove(pcie->msi_domain);
        irq_domain_remove(pcie->msi_inner_domain);
 }