Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 788858eb authored by Jake Oshins's avatar Jake Oshins Committed by Bjorn Helgaas
Browse files

PCI: Look up IRQ domain by fwnode_handle 



If pci_host_bridge_msi_domain() can't find an IRQ domain through the OF
tree, try to look it up directly through the fwnode_handle.

[bhelgaas: changelog]
Signed-off-by: default avatarJake Oshins <jakeo@microsoft.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 92016ba5

drivers/pci/probe.c

+15 −0
Original line number Diff line number Diff line
@@ -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;

}