linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] aer: add support aer interrupt with none MSI/MSI-X/INTx mode
@ 2016-05-26  6:00 Po Liu
  2016-06-02  3:48 ` Bjorn Helgaas
                   ` (2 more replies)
  0 siblings, 3 replies; 58+ messages in thread
From: Po Liu @ 2016-05-26  6:00 UTC (permalink / raw)
  To: linux-pci, linux-arm-kernel, linux-kernel, devicetree
  Cc: Shawn Guo, Marc Zyngier, Rob Herring, Roy Zang, Mingkai Hu,
	Stuart Yoder, Yang-Leo Li, Arnd Bergmann, Bjorn Helgaas,
	Minghuan Lian, Po Liu

On some platforms, root port doesn't support MSI/MSI-X/INTx in RC mode.
When chip support the aer interrupt with none MSI/MSI-X/INTx mode,
maybe there is interrupt line for aer pme etc. Search the interrupt
number in the fdt file.

Signed-off-by: Po Liu <po.liu@nxp.com>
---
 drivers/pci/pcie/portdrv_core.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 32d4d0a..64833e5 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/pcieport_if.h>
 #include <linux/aer.h>
+#include <linux/of_irq.h>
 
 #include "../pci.h"
 #include "portdrv.h"
@@ -199,6 +200,28 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
 static int init_service_irqs(struct pci_dev *dev, int *irqs, int mask)
 {
 	int i, irq = -1;
+	int ret;
+	struct device_node *np = NULL;
+
+	for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++)
+		irqs[i] = 0;
+
+	if (dev->bus->dev.of_node)
+		np = dev->bus->dev.of_node;
+
+	/* If root port doesn't support MSI/MSI-X/INTx in RC mode,
+	 * request irq for aer
+	 */
+	if (IS_ENABLED(CONFIG_OF_IRQ) && np &&
+			(mask & PCIE_PORT_SERVICE_PME)) {
+		ret = of_irq_get_byname(np, "aer");
+		if (ret > 0) {
+			irqs[PCIE_PORT_SERVICE_AER_SHIFT] = ret;
+			if (dev->irq)
+				irq = dev->irq;
+			goto no_msi;
+		}
+	}
 
 	/*
 	 * If MSI cannot be used for PCIe PME or hotplug, we have to use
@@ -224,11 +247,13 @@ static int init_service_irqs(struct pci_dev *dev, int *irqs, int mask)
 		irq = dev->irq;
 
  no_msi:
-	for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++)
-		irqs[i] = irq;
+	for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) {
+		if (!irqs[i])
+			irqs[i] = irq;
+	}
 	irqs[PCIE_PORT_SERVICE_VC_SHIFT] = -1;
 
-	if (irq < 0)
+	if (irq < 0 && irqs[PCIE_PORT_SERVICE_AER_SHIFT] < 0)
 		return -ENODEV;
 	return 0;
 }
-- 
2.1.0.27.g96db324

^ permalink raw reply related	[flat|nested] 58+ messages in thread

end of thread, other threads:[~2016-10-09  2:47 UTC | newest]

Thread overview: 58+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-26  6:00 [PATCH 2/2] aer: add support aer interrupt with none MSI/MSI-X/INTx mode Po Liu
2016-06-02  3:48 ` Bjorn Helgaas
2016-06-02  5:01   ` Po Liu
2016-06-02 13:55     ` Bjorn Helgaas
2016-06-02 15:37       ` Murali Karicheri
2016-06-03  4:09         ` Bjorn Helgaas
2016-06-03 17:31           ` Murali Karicheri
2016-06-04  3:48             ` Bjorn Helgaas
2016-06-06  7:32               ` Po Liu
2016-06-06 14:01                 ` Murali Karicheri
2016-06-06 18:10                   ` Bjorn Helgaas
2016-06-07 10:07                     ` Po Liu
2016-06-07 22:46                       ` Bjorn Helgaas
2016-06-08  4:56                         ` Po Liu
2016-06-14  6:12 ` [PATCH v2 1/2] nxp/dts: add pcie aer interrupt-name property in the dts Po Liu
2016-06-14  6:12   ` [PATCH v2 2/2] pci/aer: interrupt fixup in the quirk Po Liu
2016-06-16 13:54     ` Bjorn Helgaas
2016-06-17  3:30       ` Po Liu
2016-07-01  8:46       ` Po Liu
2016-06-14  8:24 ` [PATCH v3 1/2] nxp/dts: add pcie aer interrupt-name property in the dts Po Liu
2016-06-14  8:24   ` [PATCH v3 2/2] pci/aer: interrupt fixup in the quirk Po Liu
2016-06-23  5:43     ` Dongdong Liu
2016-07-01  8:40       ` Po Liu
2016-07-04  8:44     ` Dongdong Liu
2016-07-05  3:03       ` Po Liu
2016-07-06  8:38         ` Dongdong Liu
2016-07-29 22:41     ` Bjorn Helgaas
2016-08-22 10:09       ` Po Liu
2016-09-20 20:47         ` Bjorn Helgaas
2016-09-21  6:51           ` Po Liu
2016-09-21 21:53             ` Bjorn Helgaas
2016-08-31  6:37     ` [PATCH v4 1/2] nxp/dts: add pcie aer interrupt-name property in the dts Po Liu
2016-08-31  6:37       ` [PATCH v4 2/2] pci:aer: add support aer interrupt with none MSI/MSI-X/INTx mode Po Liu
2016-09-02 15:17         ` Rob Herring
2016-09-05  6:05           ` Po Liu
2016-09-13  4:40         ` [PATCH v5 1/3] arm/dts: add pcie aer interrupt-name property in the dts Po Liu
2016-09-13  4:40           ` [PATCH v5 2/3] arm64/dts: " Po Liu
2016-09-13  4:40           ` [PATCH v5 3/3] pci:aer: add support aer interrupt with none MSI/MSI-X/INTx mode Po Liu
2016-09-18  0:52             ` Shawn Guo
2016-09-18  3:37               ` Po Liu
2016-09-20 12:39                 ` Shawn Guo
2016-09-21  6:54                   ` Po Liu
2016-09-30 22:13                     ` Shawn Guo
2016-09-23 13:06                 ` Rob Herring
2016-09-26  8:25                   ` Po Liu
2016-09-21 22:37             ` Bjorn Helgaas
2016-09-22  2:53               ` Po Liu
2016-09-30  9:11             ` [PATCH v6 1/3] arm/dts-ls1021: add pcie aer/pme interrupt-name property in the dts Po Liu
2016-09-30  9:11               ` [PATCH v6 2/3] arm64/dts-ls1043-ls2080: " Po Liu
2016-09-30  9:11               ` [PATCH v6 3/3] pci:add support aer/pme interrupts with none MSI/MSI-X/INTx mode Po Liu
2016-10-08 20:49                 ` Rob Herring
2016-10-09  2:47                   ` Po Liu
2016-09-05  2:25       ` [PATCH v4 1/2] nxp/dts: add pcie aer interrupt-name property in the dts Shawn Guo
2016-09-12 22:13       ` Bjorn Helgaas
2016-09-13  3:02         ` Po Liu
2016-06-16  0:36   ` [PATCH v3 " Shawn Guo
2016-06-16 10:50     ` Po Liu
2016-06-16 22:19   ` Rob Herring

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).