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 4296d9e..2f3f974 100644 (file)
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -606,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);
@@ -616,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);
                }
        }
 
@@ -627,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);
@@ -654,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;
 
@@ -1044,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);