Merge branch 'pci/host-tango' into next

* pci/host-tango:
  PCI: tango: Add MSI controller support
  PCI: Use of_pci_dma_range_parser_init() to reduce duplication
  of/pci: Add of_pci_dma_range_parser_init() for dma-ranges parsing support

7 files changed, 223 insertions, 101 deletions

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 792722e7d458..fa6cabfc3cb9 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -232,8 +232,8 @@ int of_pci_address_to_resource(struct device_node *dev, int bar,
 }
 EXPORT_SYMBOL_GPL(of_pci_address_to_resource);
 
-int of_pci_range_parser_init(struct of_pci_range_parser *parser,
-                                struct device_node *node)
+static int parser_init(struct of_pci_range_parser *parser,
+                        struct device_node *node, const char *name)
 {
         const int na = 3, ns = 2;
         int rlen;
@@ -242,7 +242,7 @@ int of_pci_range_parser_init(struct of_pci_range_parser *parser,
         parser->pna = of_n_addr_cells(node);
         parser->np = parser->pna + na + ns;
 
-        parser->range = of_get_property(node, "ranges", &rlen);
+        parser->range = of_get_property(node, name, &rlen);
         if (parser->range == NULL)
                 return -ENOENT;
 
@@ -250,8 +250,21 @@ int of_pci_range_parser_init(struct of_pci_range_parser *parser,
 
         return 0;
 }
+
+int of_pci_range_parser_init(struct of_pci_range_parser *parser,
+                                struct device_node *node)
+{
+        return parser_init(parser, node, "ranges");
+}
 EXPORT_SYMBOL_GPL(of_pci_range_parser_init);
 
+int of_pci_dma_range_parser_init(struct of_pci_range_parser *parser,
+                                struct device_node *node)
+{
+        return parser_init(parser, node, "dma-ranges");
+}
+EXPORT_SYMBOL_GPL(of_pci_dma_range_parser_init);
+
 struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
                                                 struct of_pci_range *range)
 {
diff --git a/drivers/pci/host/pci-ftpci100.c b/drivers/pci/host/pci-ftpci100.c
index a19919c17d04..fae6bd190770 100644
--- a/drivers/pci/host/pci-ftpci100.c
+++ b/drivers/pci/host/pci-ftpci100.c
@@ -370,24 +370,6 @@ static int faraday_pci_setup_cascaded_irq(struct faraday_pci *p)
         return 0;
 }
 
-static int pci_dma_range_parser_init(struct of_pci_range_parser *parser,
-                                     struct device_node *node)
-{
-        const int na = 3, ns = 2;
-        int rlen;
-
-        parser->node = node;
-        parser->pna = of_n_addr_cells(node);
-        parser->np = parser->pna + na + ns;
-
-        parser->range = of_get_property(node, "dma-ranges", &rlen);
-        if (!parser->range)
-                return -ENOENT;
-        parser->end = parser->range + rlen / sizeof(__be32);
-
-        return 0;
-}
-
 static int faraday_pci_parse_map_dma_ranges(struct faraday_pci *p,
                                             struct device_node *np)
 {
@@ -402,7 +384,7 @@ static int faraday_pci_parse_map_dma_ranges(struct faraday_pci *p,
         int i = 0;
         u32 val;
 
-        if (pci_dma_range_parser_init(&parser, np)) {
+        if (of_pci_dma_range_parser_init(&parser, np)) {
                 dev_err(dev, "missing dma-ranges property\n");
                 return -EINVAL;
         }
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c
index 6f879685fedd..e46de69f0380 100644
--- a/drivers/pci/host/pci-rcar-gen2.c
+++ b/drivers/pci/host/pci-rcar-gen2.c
@@ -293,24 +293,6 @@ static struct pci_ops rcar_pci_ops = {
         .write  = pci_generic_config_write,
 };
 
-static int pci_dma_range_parser_init(struct of_pci_range_parser *parser,
-                                     struct device_node *node)
-{
-        const int na = 3, ns = 2;
-        int rlen;
-
-        parser->node = node;
-        parser->pna = of_n_addr_cells(node);
-        parser->np = parser->pna + na + ns;
-
-        parser->range = of_get_property(node, "dma-ranges", &rlen);
-        if (!parser->range)
-                return -ENOENT;
-
-        parser->end = parser->range + rlen / sizeof(__be32);
-        return 0;
-}
-
 static int rcar_pci_parse_map_dma_ranges(struct rcar_pci_priv *pci,
                                          struct device_node *np)
 {
@@ -320,7 +302,7 @@ static int rcar_pci_parse_map_dma_ranges(struct rcar_pci_priv *pci,
         int index = 0;
 
         /* Failure to parse is ok as we fall back to defaults */
-        if (pci_dma_range_parser_init(&parser, np))
+        if (of_pci_dma_range_parser_init(&parser, np))
                 return 0;
 
         /* Get the dma-ranges from DT */
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 087645116ecb..8fc45d95edab 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -542,24 +542,6 @@ static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port,
         xgene_pcie_setup_pims(port, pim_reg, pci_addr, ~(size - 1));
 }
 
-static int pci_dma_range_parser_init(struct of_pci_range_parser *parser,
-                                     struct device_node *node)
-{
-        const int na = 3, ns = 2;
-        int rlen;
-
-        parser->node = node;
-        parser->pna = of_n_addr_cells(node);
-        parser->np = parser->pna + na + ns;
-
-        parser->range = of_get_property(node, "dma-ranges", &rlen);
-        if (!parser->range)
-                return -ENOENT;
-        parser->end = parser->range + rlen / sizeof(__be32);
-
-        return 0;
-}
-
 static int xgene_pcie_parse_map_dma_ranges(struct xgene_pcie_port *port)
 {
         struct device_node *np = port->node;
@@ -568,7 +550,7 @@ static int xgene_pcie_parse_map_dma_ranges(struct xgene_pcie_port *port)
         struct device *dev = port->dev;
         u8 ib_reg_mask = 0;
 
-        if (pci_dma_range_parser_init(&parser, np)) {
+        if (of_pci_dma_range_parser_init(&parser, np)) {
                 dev_err(dev, "missing dma-ranges property\n");
                 return -EINVAL;
         }
diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
index 3a8b9d20ee57..935909bbe5c4 100644
--- a/drivers/pci/host/pcie-iproc.c
+++ b/drivers/pci/host/pcie-iproc.c
@@ -1097,24 +1097,6 @@ err_ib:
         return ret;
 }
 
-static int pci_dma_range_parser_init(struct of_pci_range_parser *parser,
-                                     struct device_node *node)
-{
-        const int na = 3, ns = 2;
-        int rlen;
-
-        parser->node = node;
-        parser->pna = of_n_addr_cells(node);
-        parser->np = parser->pna + na + ns;
-
-        parser->range = of_get_property(node, "dma-ranges", &rlen);
-        if (!parser->range)
-                return -ENOENT;
-
-        parser->end = parser->range + rlen / sizeof(__be32);
-        return 0;
-}
-
 static int iproc_pcie_map_dma_ranges(struct iproc_pcie *pcie)
 {
         struct of_pci_range range;
@@ -1122,7 +1104,7 @@ static int iproc_pcie_map_dma_ranges(struct iproc_pcie *pcie)
         int ret;
 
         /* Get the dma-ranges from DT */
-        ret = pci_dma_range_parser_init(&parser, pcie->dev->of_node);
+        ret = of_pci_dma_range_parser_init(&parser, pcie->dev->of_node);
         if (ret)
                 return ret;
 
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 4e0b25d09b0c..12796eccb2be 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -1027,24 +1027,6 @@ static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie,
         return 0;
 }
 
-static int pci_dma_range_parser_init(struct of_pci_range_parser *parser,
-                                     struct device_node *node)
-{
-        const int na = 3, ns = 2;
-        int rlen;
-
-        parser->node = node;
-        parser->pna = of_n_addr_cells(node);
-        parser->np = parser->pna + na + ns;
-
-        parser->range = of_get_property(node, "dma-ranges", &rlen);
-        if (!parser->range)
-                return -ENOENT;
-
-        parser->end = parser->range + rlen / sizeof(__be32);
-        return 0;
-}
-
 static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie,
                                           struct device_node *np)
 {
@@ -1053,7 +1035,7 @@ static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie,
         int index = 0;
         int err;
 
-        if (pci_dma_range_parser_init(&parser, np))
+        if (of_pci_dma_range_parser_init(&parser, np))
                 return -EINVAL;
 
         /* Get the dma-ranges from DT */
diff --git a/drivers/pci/host/pcie-tango.c b/drivers/pci/host/pcie-tango.c
index 6bbb81f06a53..e23f7383ac33 100644
--- a/drivers/pci/host/pcie-tango.c
+++ b/drivers/pci/host/pcie-tango.c
@@ -1,12 +1,172 @@
+#include <linux/irqchip/chained_irq.h>
+#include <linux/irqdomain.h>
 #include <linux/pci-ecam.h>
 #include <linux/delay.h>
-#include <linux/of.h>
+#include <linux/msi.h>
+#include <linux/of_address.h>
+
+#define MSI_MAX                 256
 
 #define SMP8759_MUX             0x48
 #define SMP8759_TEST_OUT        0x74
+#define SMP8759_DOORBELL        0x7c
+#define SMP8759_STATUS          0x80
+#define SMP8759_ENABLE          0xa0
 
 struct tango_pcie {
-        void __iomem *base;
+        DECLARE_BITMAP(used_msi, MSI_MAX);
+        u64                     msi_doorbell;
+        spinlock_t              used_msi_lock;
+        void __iomem            *base;
+        struct irq_domain       *dom;
+};
+
+static void tango_msi_isr(struct irq_desc *desc)
+{
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct tango_pcie *pcie = irq_desc_get_handler_data(desc);
+        unsigned long status, base, virq, idx, pos = 0;
+
+        chained_irq_enter(chip, desc);
+        spin_lock(&pcie->used_msi_lock);
+
+        while ((pos = find_next_bit(pcie->used_msi, MSI_MAX, pos)) < MSI_MAX) {
+                base = round_down(pos, 32);
+                status = readl_relaxed(pcie->base + SMP8759_STATUS + base / 8);
+                for_each_set_bit(idx, &status, 32) {
+                        virq = irq_find_mapping(pcie->dom, base + idx);
+                        generic_handle_irq(virq);
+                }
+                pos = base + 32;
+        }
+
+        spin_unlock(&pcie->used_msi_lock);
+        chained_irq_exit(chip, desc);
+}
+
+static void tango_ack(struct irq_data *d)
+{
+        struct tango_pcie *pcie = d->chip_data;
+        u32 offset = (d->hwirq / 32) * 4;
+        u32 bit = BIT(d->hwirq % 32);
+
+        writel_relaxed(bit, pcie->base + SMP8759_STATUS + offset);
+}
+
+static void update_msi_enable(struct irq_data *d, bool unmask)
+{
+        unsigned long flags;
+        struct tango_pcie *pcie = d->chip_data;
+        u32 offset = (d->hwirq / 32) * 4;
+        u32 bit = BIT(d->hwirq % 32);
+        u32 val;
+
+        spin_lock_irqsave(&pcie->used_msi_lock, flags);
+        val = readl_relaxed(pcie->base + SMP8759_ENABLE + offset);
+        val = unmask ? val | bit : val & ~bit;
+        writel_relaxed(val, pcie->base + SMP8759_ENABLE + offset);
+        spin_unlock_irqrestore(&pcie->used_msi_lock, flags);
+}
+
+static void tango_mask(struct irq_data *d)
+{
+        update_msi_enable(d, false);
+}
+
+static void tango_unmask(struct irq_data *d)
+{
+        update_msi_enable(d, true);
+}
+
+static int tango_set_affinity(struct irq_data *d, const struct cpumask *mask,
+                              bool force)
+{
+        return -EINVAL;
+}
+
+static void tango_compose_msi_msg(struct irq_data *d, struct msi_msg *msg)
+{
+        struct tango_pcie *pcie = d->chip_data;
+        msg->address_lo = lower_32_bits(pcie->msi_doorbell);
+        msg->address_hi = upper_32_bits(pcie->msi_doorbell);
+        msg->data = d->hwirq;
+}
+
+static struct irq_chip tango_chip = {
+        .irq_ack                = tango_ack,
+        .irq_mask               = tango_mask,
+        .irq_unmask             = tango_unmask,
+        .irq_set_affinity       = tango_set_affinity,
+        .irq_compose_msi_msg    = tango_compose_msi_msg,
+};
+
+static void msi_ack(struct irq_data *d)
+{
+        irq_chip_ack_parent(d);
+}
+
+static void msi_mask(struct irq_data *d)
+{
+        pci_msi_mask_irq(d);
+        irq_chip_mask_parent(d);
+}
+
+static void msi_unmask(struct irq_data *d)
+{
+        pci_msi_unmask_irq(d);
+        irq_chip_unmask_parent(d);
+}
+
+static struct irq_chip msi_chip = {
+        .name = "MSI",
+        .irq_ack = msi_ack,
+        .irq_mask = msi_mask,
+        .irq_unmask = msi_unmask,
+};
+
+static struct msi_domain_info msi_dom_info = {
+        .flags  = MSI_FLAG_PCI_MSIX
+                | MSI_FLAG_USE_DEF_DOM_OPS
+                | MSI_FLAG_USE_DEF_CHIP_OPS,
+        .chip   = &msi_chip,
+};
+
+static int tango_irq_domain_alloc(struct irq_domain *dom, unsigned int virq,
+                                  unsigned int nr_irqs, void *args)
+{
+        struct tango_pcie *pcie = dom->host_data;
+        unsigned long flags;
+        int pos;
+
+        spin_lock_irqsave(&pcie->used_msi_lock, flags);
+        pos = find_first_zero_bit(pcie->used_msi, MSI_MAX);
+        if (pos >= MSI_MAX) {
+                spin_unlock_irqrestore(&pcie->used_msi_lock, flags);
+                return -ENOSPC;
+        }
+        __set_bit(pos, pcie->used_msi);
+        spin_unlock_irqrestore(&pcie->used_msi_lock, flags);
+        irq_domain_set_info(dom, virq, pos, &tango_chip,
+                        pcie, handle_edge_irq, NULL, NULL);
+
+        return 0;
+}
+
+static void tango_irq_domain_free(struct irq_domain *dom, unsigned int virq,
+                                  unsigned int nr_irqs)
+{
+        unsigned long flags;
+        struct irq_data *d = irq_domain_get_irq_data(dom, virq);
+        struct tango_pcie *pcie = d->chip_data;
+
+        spin_lock_irqsave(&pcie->used_msi_lock, flags);
+        __clear_bit(d->hwirq, pcie->used_msi);
+        spin_unlock_irqrestore(&pcie->used_msi_lock, flags);
+}
+
+static const struct irq_domain_ops dom_ops = {
+        .alloc  = tango_irq_domain_alloc,
+        .free   = tango_irq_domain_free,
 };
 
 static int smp8759_config_read(struct pci_bus *bus, unsigned int devfn,
@@ -76,7 +236,11 @@ static int tango_pcie_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct tango_pcie *pcie;
         struct resource *res;
-        int ret;
+        struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node);
+        struct irq_domain *msi_dom, *irq_dom;
+        struct of_pci_range_parser parser;
+        struct of_pci_range range;
+        int virq, offset;
 
         dev_warn(dev, "simultaneous PCI config and MMIO accesses may cause data corruption\n");
         add_taint(TAINT_CRAP, LOCKDEP_STILL_OK);
@@ -95,6 +259,41 @@ static int tango_pcie_probe(struct platform_device *pdev)
         if (!tango_pcie_link_up(pcie))
                 return -ENODEV;
 
+        if (of_pci_dma_range_parser_init(&parser, dev->of_node) < 0)
+                return -ENOENT;
+
+        if (of_pci_range_parser_one(&parser, &range) == NULL)
+                return -ENOENT;
+
+        range.pci_addr += range.size;
+        pcie->msi_doorbell = range.pci_addr + res->start + SMP8759_DOORBELL;
+
+        for (offset = 0; offset < MSI_MAX / 8; offset += 4)
+                writel_relaxed(0, pcie->base + SMP8759_ENABLE + offset);
+
+        virq = platform_get_irq(pdev, 1);
+        if (virq <= 0) {
+                dev_err(dev, "Failed to map IRQ\n");
+                return -ENXIO;
+        }
+
+        irq_dom = irq_domain_create_linear(fwnode, MSI_MAX, &dom_ops, pcie);
+        if (!irq_dom) {
+                dev_err(dev, "Failed to create IRQ domain\n");
+                return -ENOMEM;
+        }
+
+        msi_dom = pci_msi_create_irq_domain(fwnode, &msi_dom_info, irq_dom);
+        if (!msi_dom) {
+                dev_err(dev, "Failed to create MSI domain\n");
+                irq_domain_remove(irq_dom);
+                return -ENOMEM;
+        }
+
+        pcie->dom = irq_dom;
+        spin_lock_init(&pcie->used_msi_lock);
+        irq_set_chained_handler_and_data(virq, tango_msi_isr, pcie);
+
         return pci_host_common_probe(pdev, &smp8759_ecam_ops);
 }