staging: fsl-mc: Move irqchip code out of staging
authorBogdan Purcareata <bogdan.purcareata@nxp.com>
Mon, 5 Feb 2018 14:07:43 +0000 (08:07 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Feb 2018 14:11:30 +0000 (15:11 +0100)
Now that the fsl-mc bus core infrastructure is out of staging, the
remaining irqchip glue code used (irq-gic-v3-its-fsl-mc-msi.c) goes
to drivers/irqchip.

Create new Kconfig option for irqchip code that depends on
FSL_MC_BUS and ARM_GIC_V3_ITS. This ensures irqchip code only
gets built on ARM64 platforms. We can now remove #ifdef
GENERIC_MSI_DOMAIN_OPS as it was only needed for x86.

Signed-off-by: Stuart Yoder <stuyoder@gmail.com>
[rebased, add dpaa2_eth and dpio #include updates]
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
[rebased, split irqchip to separate patch]
Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>
[add Kconfig dependency on ARM_GIC_V3_ITS]
Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/irqchip/Kconfig
drivers/irqchip/Makefile
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c [new file with mode: 0644]
drivers/staging/fsl-mc/bus/Makefile
drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c [deleted file]

index d913aec851097a1a5d848a68ad5940992f798c85..f2ace51053425a3a1d971f131b0e3608d3c4a4b5 100644 (file)
@@ -51,6 +51,12 @@ config ARM_GIC_V3_ITS_PCI
        depends on PCI_MSI
        default ARM_GIC_V3_ITS
 
+config ARM_GIC_V3_ITS_FSL_MC
+       bool
+       depends on ARM_GIC_V3_ITS
+       depends on FSL_MC_BUS
+       default ARM_GIC_V3_ITS
+
 config ARM_NVIC
        bool
        select IRQ_DOMAIN
index d27e3e3619e04842f852a6f5d413db8d2c8f4156..1ba439040bb163cc2f9b0c02b28cccb10656afb1 100644 (file)
@@ -32,6 +32,7 @@ obj-$(CONFIG_ARM_GIC_V2M)             += irq-gic-v2m.o
 obj-$(CONFIG_ARM_GIC_V3)               += irq-gic-v3.o irq-gic-common.o
 obj-$(CONFIG_ARM_GIC_V3_ITS)           += irq-gic-v3-its.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o
 obj-$(CONFIG_ARM_GIC_V3_ITS_PCI)       += irq-gic-v3-its-pci-msi.o
+obj-$(CONFIG_ARM_GIC_V3_ITS_FSL_MC)    += irq-gic-v3-its-fsl-mc-msi.o
 obj-$(CONFIG_PARTITION_PERCPU)         += irq-partition-percpu.o
 obj-$(CONFIG_HISILICON_IRQ_MBIGEN)     += irq-mbigen.o
 obj-$(CONFIG_ARM_NVIC)                 += irq-nvic.o
diff --git a/drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c b/drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c
new file mode 100644 (file)
index 0000000..13a5d9a
--- /dev/null
@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Freescale Management Complex (MC) bus driver MSI support
+ *
+ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
+ * Author: German Rivera <German.Rivera@freescale.com>
+ *
+ */
+
+#include <linux/of_device.h>
+#include <linux/of_address.h>
+#include <linux/irq.h>
+#include <linux/msi.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/fsl/mc.h>
+
+static struct irq_chip its_msi_irq_chip = {
+       .name = "ITS-fMSI",
+       .irq_mask = irq_chip_mask_parent,
+       .irq_unmask = irq_chip_unmask_parent,
+       .irq_eoi = irq_chip_eoi_parent,
+       .irq_set_affinity = msi_domain_set_affinity
+};
+
+static int its_fsl_mc_msi_prepare(struct irq_domain *msi_domain,
+                                 struct device *dev,
+                                 int nvec, msi_alloc_info_t *info)
+{
+       struct fsl_mc_device *mc_bus_dev;
+       struct msi_domain_info *msi_info;
+
+       if (!dev_is_fsl_mc(dev))
+               return -EINVAL;
+
+       mc_bus_dev = to_fsl_mc_device(dev);
+       if (!(mc_bus_dev->flags & FSL_MC_IS_DPRC))
+               return -EINVAL;
+
+       /*
+        * Set the device Id to be passed to the GIC-ITS:
+        *
+        * NOTE: This device id corresponds to the IOMMU stream ID
+        * associated with the DPRC object (ICID).
+        */
+       info->scratchpad[0].ul = mc_bus_dev->icid;
+       msi_info = msi_get_domain_info(msi_domain->parent);
+       return msi_info->ops->msi_prepare(msi_domain->parent, dev, nvec, info);
+}
+
+static struct msi_domain_ops its_fsl_mc_msi_ops __ro_after_init = {
+       .msi_prepare = its_fsl_mc_msi_prepare,
+};
+
+static struct msi_domain_info its_fsl_mc_msi_domain_info = {
+       .flags  = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
+       .ops    = &its_fsl_mc_msi_ops,
+       .chip   = &its_msi_irq_chip,
+};
+
+static const struct of_device_id its_device_id[] = {
+       {       .compatible     = "arm,gic-v3-its",     },
+       {},
+};
+
+static int __init its_fsl_mc_msi_init(void)
+{
+       struct device_node *np;
+       struct irq_domain *parent;
+       struct irq_domain *mc_msi_domain;
+
+       for (np = of_find_matching_node(NULL, its_device_id); np;
+            np = of_find_matching_node(np, its_device_id)) {
+               if (!of_property_read_bool(np, "msi-controller"))
+                       continue;
+
+               parent = irq_find_matching_host(np, DOMAIN_BUS_NEXUS);
+               if (!parent || !msi_get_domain_info(parent)) {
+                       pr_err("%pOF: unable to locate ITS domain\n", np);
+                       continue;
+               }
+
+               mc_msi_domain = fsl_mc_msi_create_irq_domain(
+                                                of_node_to_fwnode(np),
+                                                &its_fsl_mc_msi_domain_info,
+                                                parent);
+               if (!mc_msi_domain) {
+                       pr_err("%pOF: unable to create fsl-mc domain\n", np);
+                       continue;
+               }
+
+               pr_info("fsl-mc MSI: %pOF domain created\n", np);
+       }
+
+       return 0;
+}
+
+early_initcall(its_fsl_mc_msi_init);
index 18b1b5fdaf76b5bfe7986f5f3919178e703c54be..b67889ecbe5c82015945888e5dec0e9acd87e26b 100644 (file)
@@ -4,8 +4,7 @@
 #
 # Copyright (C) 2014 Freescale Semiconductor, Inc.
 #
-obj-$(CONFIG_FSL_MC_BUS) += irq-gic-v3-its-fsl-mc-msi.o \
-                           dpbp.o \
+obj-$(CONFIG_FSL_MC_BUS) += dpbp.o \
                            dpcon.o
 
 # MC DPIO driver
diff --git a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c
deleted file mode 100644 (file)
index b365fbb..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Freescale Management Complex (MC) bus driver MSI support
- *
- * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
- * Author: German Rivera <German.Rivera@freescale.com>
- *
- */
-
-#include <linux/of_device.h>
-#include <linux/of_address.h>
-#include <linux/irq.h>
-#include <linux/msi.h>
-#include <linux/of.h>
-#include <linux/of_irq.h>
-#include <linux/fsl/mc.h>
-
-static struct irq_chip its_msi_irq_chip = {
-       .name = "ITS-fMSI",
-       .irq_mask = irq_chip_mask_parent,
-       .irq_unmask = irq_chip_unmask_parent,
-       .irq_eoi = irq_chip_eoi_parent,
-       .irq_set_affinity = msi_domain_set_affinity
-};
-
-static int its_fsl_mc_msi_prepare(struct irq_domain *msi_domain,
-                                 struct device *dev,
-                                 int nvec, msi_alloc_info_t *info)
-{
-       struct fsl_mc_device *mc_bus_dev;
-       struct msi_domain_info *msi_info;
-
-       if (!dev_is_fsl_mc(dev))
-               return -EINVAL;
-
-       mc_bus_dev = to_fsl_mc_device(dev);
-       if (!(mc_bus_dev->flags & FSL_MC_IS_DPRC))
-               return -EINVAL;
-
-       /*
-        * Set the device Id to be passed to the GIC-ITS:
-        *
-        * NOTE: This device id corresponds to the IOMMU stream ID
-        * associated with the DPRC object (ICID).
-        */
-#ifdef GENERIC_MSI_DOMAIN_OPS
-       info->scratchpad[0].ul = mc_bus_dev->icid;
-#endif
-       msi_info = msi_get_domain_info(msi_domain->parent);
-       return msi_info->ops->msi_prepare(msi_domain->parent, dev, nvec, info);
-}
-
-static struct msi_domain_ops its_fsl_mc_msi_ops __ro_after_init = {
-       .msi_prepare = its_fsl_mc_msi_prepare,
-};
-
-static struct msi_domain_info its_fsl_mc_msi_domain_info = {
-       .flags  = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
-       .ops    = &its_fsl_mc_msi_ops,
-       .chip   = &its_msi_irq_chip,
-};
-
-static const struct of_device_id its_device_id[] = {
-       {       .compatible     = "arm,gic-v3-its",     },
-       {},
-};
-
-static int __init its_fsl_mc_msi_init(void)
-{
-       struct device_node *np;
-       struct irq_domain *parent;
-       struct irq_domain *mc_msi_domain;
-
-       for (np = of_find_matching_node(NULL, its_device_id); np;
-            np = of_find_matching_node(np, its_device_id)) {
-               if (!of_property_read_bool(np, "msi-controller"))
-                       continue;
-
-               parent = irq_find_matching_host(np, DOMAIN_BUS_NEXUS);
-               if (!parent || !msi_get_domain_info(parent)) {
-                       pr_err("%pOF: unable to locate ITS domain\n", np);
-                       continue;
-               }
-
-               mc_msi_domain = fsl_mc_msi_create_irq_domain(
-                                                of_node_to_fwnode(np),
-                                                &its_fsl_mc_msi_domain_info,
-                                                parent);
-               if (!mc_msi_domain) {
-                       pr_err("%pOF: unable to create fsl-mc domain\n", np);
-                       continue;
-               }
-
-               pr_info("fsl-mc MSI: %pOF domain created\n", np);
-       }
-
-       return 0;
-}
-
-early_initcall(its_fsl_mc_msi_init);