[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1455045869-38341-3-git-send-email-jakeo@microsoft.com>
Date: Tue, 9 Feb 2016 19:24:27 +0000
From: jakeo@...rosoft.com
To: bhelgaas@...gle.com, linux-pci@...r.kernel.org,
gregkh@...uxfoundation.org, kys@...rosoft.com,
linux-kernel@...r.kernel.org, devel@...uxdriverproject.org,
olaf@...fle.de, apw@...onical.com, vkuznets@...hat.com,
tglx@...utronix.de, haiyangz@...rosoft.com, marc.zyngier@....com,
haddenh@...rosoft.com
Cc: Jake Oshins <jakeo@...rosoft.com>
Subject: [PATCH RESEND v2 2/3] PCI: irqdomain: Look up IRQ domain by fwnode_handle
From: Jake Oshins <jakeo@...rosoft.com>
This patch adds a second way of finding an IRQ domain associated with
a root PCI bus. After looking to see if one can be found through
the OF tree, it attempts to look up the IRQ domain through an
fwnode_handle stored in the pci_sysdata struct.
Signed-off-by: Jake Oshins <jakeo@...rosoft.com>
---
drivers/pci/probe.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 6d7ab9b..1e34d21 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -15,6 +15,7 @@
#include <linux/pci-aspm.h>
#include <linux/aer.h>
#include <linux/acpi.h>
+#include <linux/irqdomain.h>
#include <asm-generic/pci-bridge.h>
#include "pci.h"
@@ -675,6 +676,20 @@ static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus)
if (!d)
d = pci_host_bridge_acpi_msi_domain(bus);
+#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN
+ /*
+ * If no IRQ domain was found via the OF tree, try looking it up
+ * directly through the fwnode_handle.
+ */
+ if (!d) {
+ struct fwnode_handle *fwnode = pci_root_bus_fwnode(bus);
+
+ if (fwnode)
+ d = irq_find_matching_fwnode(fwnode,
+ DOMAIN_BUS_PCI_MSI);
+ }
+#endif
+
return d;
}
--
1.9.1
Powered by blists - more mailing lists