irqchip/mvebu-odmi: Switch to parent MSI

All platform MSI users and the PCI/MSI code handle per device MSI domains
when the irqdomain associated to the device provides MSI parent
functionality.

Remove the "global" platform domain related code and provide the MSI parent
functionality by filling in msi_parent_ops.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Shivamurthy Shastri <shivamurthy.shastri@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240623142235.759892514@linutronix.de

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index a0fa59928913aa4f2b6553dc56077ec55a820c04..4def6dc76fa673367898d274c9a32b9400bfe813 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -379,6 +379,7 @@ config MVEBU_ICU
 
 config MVEBU_ODMI
        bool
+       select IRQ_MSI_LIB
        select GENERIC_MSI_IRQ
 
 config MVEBU_PIC

diff --git a/drivers/irqchip/irq-mvebu-odmi.c b/drivers/irqchip/irq-mvebu-odmi.c
index 108091533e10dc3da589ae45760ea01983d01606..ff19bfd258dceabfce26bf4c03f11de2aa7589d7 100644 (file)
--- a/drivers/irqchip/irq-mvebu-odmi.c
+++ b/drivers/irqchip/irq-mvebu-odmi.c
@@ -17,6 +17,9 @@
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/slab.h>
+
+#include "irq-msi-lib.h"
+
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 #define GICP_ODMIN_SET                 0x40
@@ -141,27 +144,29 @@ static void odmi_irq_domain_free(struct irq_domain *domain,
 }
 
 static const struct irq_domain_ops odmi_domain_ops = {
+       .select = msi_lib_irq_domain_select,
        .alloc  = odmi_irq_domain_alloc,
        .free   = odmi_irq_domain_free,
 };
 
-static struct irq_chip odmi_msi_irq_chip = {
-       .name   = "ODMI",
-};
+#define ODMI_MSI_FLAGS_REQUIRED  (MSI_FLAG_USE_DEF_DOM_OPS |   \
+                                 MSI_FLAG_USE_DEF_CHIP_OPS)
 
-static struct msi_domain_ops odmi_msi_ops = {
-};
+#define ODMI_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK)
 
-static struct msi_domain_info odmi_msi_domain_info = {
-       .flags  = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
-       .ops    = &odmi_msi_ops,
-       .chip   = &odmi_msi_irq_chip,
+static const struct msi_parent_ops odmi_msi_parent_ops = {
+       .supported_flags        = ODMI_MSI_FLAGS_SUPPORTED,
+       .required_flags         = ODMI_MSI_FLAGS_REQUIRED,
+       .bus_select_token       = DOMAIN_BUS_GENERIC_MSI,
+       .bus_select_mask        = MATCH_PLATFORM_MSI,
+       .prefix                 = "ODMI-",
+       .init_dev_msi_info      = msi_lib_init_dev_msi_info,
 };
 
 static int __init mvebu_odmi_init(struct device_node *node,
                                  struct device_node *parent)
 {
-       struct irq_domain *parent_domain, *inner_domain, *plat_domain;
+       struct irq_domain *parent_domain, *inner_domain;
        int ret, i;
 
        if (of_property_read_u32(node, "marvell,odmi-frames", &odmis_count))
@@ -208,18 +213,12 @@ static int __init mvebu_odmi_init(struct device_node *node,
                goto err_unmap;
        }
 
-       plat_domain = platform_msi_create_irq_domain(of_node_to_fwnode(node),
-                                                    &odmi_msi_domain_info,
-                                                    inner_domain);
-       if (!plat_domain) {
-               ret = -ENOMEM;
-               goto err_remove_inner;
-       }
+       irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_GENERIC_MSI);
+       inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT;
+       inner_domain->msi_parent_ops = &odmi_msi_parent_ops;
 
        return 0;
 
-err_remove_inner:
-       irq_domain_remove(inner_domain);
 err_unmap:
        for (i = 0; i < odmis_count; i++) {
                struct odmi_data *odmi = &odmis[i];