Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / pci / controller / pcie-mediatek.c

diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 25bee69..2f3f974 100644 (file)
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -14,6 +14,7 @@
 #include <linux/irqchip/chained_irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
+#include <linux/mfd/syscon.h>
 #include <linux/msi.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
@@ -23,6 +24,7 @@
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/regmap.h>
 #include <linux/reset.h>
 
 #include "../pci.h"
@@ -207,6 +209,7 @@ struct mtk_pcie_port {
  * struct mtk_pcie - PCIe host information
  * @dev: pointer to PCIe device
  * @base: IO mapped register base
+ * @cfg: IO mapped register map for PCIe config
  * @free_ck: free-run reference clock
  * @mem: non-prefetchable memory resource
  * @ports: pointer to PCIe port information
@@ -215,6 +218,7 @@ struct mtk_pcie_port {
 struct mtk_pcie {
        struct device *dev;
        void __iomem *base;
+       struct regmap *cfg;
        struct clk *free_ck;
 
        struct list_head ports;
@@ -602,7 +606,6 @@ static void mtk_pcie_intr_handler(struct irq_desc *desc)
        struct mtk_pcie_port *port = irq_desc_get_handler_data(desc);
        struct irq_chip *irqchip = irq_desc_get_chip(desc);
        unsigned long status;
-       u32 virq;
        u32 bit = INTX_SHIFT;
 
        chained_irq_enter(irqchip, desc);
@@ -612,9 +615,8 @@ static void mtk_pcie_intr_handler(struct irq_desc *desc)
                for_each_set_bit_from(bit, &status, PCI_NUM_INTX + INTX_SHIFT) {
                        /* Clear the INTx */
                        writel(1 << bit, port->base + PCIE_INT_STATUS);
-                       virq = irq_find_mapping(port->irq_domain,
-                                               bit - INTX_SHIFT);
-                       generic_handle_irq(virq);
+                       generic_handle_domain_irq(port->irq_domain,
+                                                 bit - INTX_SHIFT);
                }
        }
 
@@ -623,10 +625,8 @@ static void mtk_pcie_intr_handler(struct irq_desc *desc)
                        unsigned long imsi_status;
 
                        while ((imsi_status = readl(port->base + PCIE_IMSI_STATUS))) {
-                               for_each_set_bit(bit, &imsi_status, MTK_MSI_IRQS_NUM) {
-                                       virq = irq_find_mapping(port->inner_domain, bit);
-                                       generic_handle_irq(virq);
-                               }
+                               for_each_set_bit(bit, &imsi_status, MTK_MSI_IRQS_NUM)
+                                       generic_handle_domain_irq(port->inner_domain, bit);
                        }
                        /* Clear MSI interrupt status */
                        writel(MSI_STATUS, port->base + PCIE_INT_STATUS);
@@ -650,7 +650,11 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port,
                return err;
        }
 
-       port->irq = platform_get_irq(pdev, port->slot);
+       if (of_find_property(dev->of_node, "interrupt-names", NULL))
+               port->irq = platform_get_irq_byname(pdev, "pcie_irq");
+       else
+               port->irq = platform_get_irq(pdev, port->slot);
+
        if (port->irq < 0)
                return port->irq;
 
@@ -682,6 +686,10 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
                val |= PCIE_CSR_LTSSM_EN(port->slot) |
                       PCIE_CSR_ASPM_L1_EN(port->slot);
                writel(val, pcie->base + PCIE_SYS_CFG_V2);
+       } else if (pcie->cfg) {
+               val = PCIE_CSR_LTSSM_EN(port->slot) |
+                     PCIE_CSR_ASPM_L1_EN(port->slot);
+               regmap_update_bits(pcie->cfg, PCIE_SYS_CFG_V2, val, val);
        }
 
        /* Assert all reset signals */
@@ -985,6 +993,7 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
        struct device *dev = pcie->dev;
        struct platform_device *pdev = to_platform_device(dev);
        struct resource *regs;
+       struct device_node *cfg_node;
        int err;
 
        /* get shared registers, which are optional */
@@ -995,6 +1004,14 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
                        return PTR_ERR(pcie->base);
        }
 
+       cfg_node = of_find_compatible_node(NULL, NULL,
+                                          "mediatek,generic-pciecfg");
+       if (cfg_node) {
+               pcie->cfg = syscon_node_to_regmap(cfg_node);
+               if (IS_ERR(pcie->cfg))
+                       return PTR_ERR(pcie->cfg);
+       }
+
        pcie->free_ck = devm_clk_get(dev, "free_ck");
        if (IS_ERR(pcie->free_ck)) {
                if (PTR_ERR(pcie->free_ck) == -EPROBE_DEFER)
@@ -1027,22 +1044,27 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie)
        struct device *dev = pcie->dev;
        struct device_node *node = dev->of_node, *child;
        struct mtk_pcie_port *port, *tmp;
-       int err;
+       int err, slot;
+
+       slot = of_get_pci_domain_nr(dev->of_node);
+       if (slot < 0) {
+               for_each_available_child_of_node(node, child) {
+                       err = of_pci_get_devfn(child);
+                       if (err < 0) {
+                               dev_err(dev, "failed to get devfn: %d\n", err);
+                               goto error_put_node;
+                       }
 
-       for_each_available_child_of_node(node, child) {
-               int slot;
+                       slot = PCI_SLOT(err);
 
-               err = of_pci_get_devfn(child);
-               if (err < 0) {
-                       dev_err(dev, "failed to parse devfn: %d\n", err);
-                       goto error_put_node;
+                       err = mtk_pcie_parse_port(pcie, child, slot);
+                       if (err)
+                               goto error_put_node;
                }
-
-               slot = PCI_SLOT(err);
-
-               err = mtk_pcie_parse_port(pcie, child, slot);
+       } else {
+               err = mtk_pcie_parse_port(pcie, node, slot);
                if (err)
-                       goto error_put_node;
+                       return err;
        }
 
        err = mtk_pcie_subsys_powerup(pcie);