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

Commit b165e2b6 authored by Marc Zyngier's avatar Marc Zyngier Committed by Thomas Gleixner
Browse files

PCI/MSI: Add support for OF-provided msi_domain 



In order to populate the PCI host bridge msi_domain, use the
"msi-parent" attribute to lookup a corresponding irq domain.
If found, this is our MSI domain.

This gets plugged into the core PCI code.

Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Ma Jun <majun258@huawei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Duc Dang <dhdang@apm.com>
Cc: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-6-git-send-email-marc.zyngier@arm.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 44aa0c65

drivers/pci/of.c

+25 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#include <linux/irqdomain.h>

#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/of.h>
@@ -59,3 +60,27 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus) 
		return of_node_get(bus->bridge->parent->of_node);

	return NULL;

}



struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus)

{

#ifdef CONFIG_IRQ_DOMAIN

	struct device_node *np;

	struct irq_domain *d;



	if (!bus->dev.of_node)

		return NULL;



	/* Start looking for a phandle to an MSI controller. */

	np = of_parse_phandle(bus->dev.of_node, "msi-parent", 0);

	if (!np)

		return NULL;



	d = irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI);

	if (d)

		return d;



	return irq_find_host(np);

#else

	return NULL;

#endif

}

drivers/pci/probe.c

+4 −1
Original line number Diff line number Diff line
@@ -663,12 +663,15 @@ static void pci_set_bus_speed(struct pci_bus *bus) 


static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus)

{

	struct irq_domain *d;



	/*

	 * Any firmware interface that can resolve the msi_domain

	 * should be called from here.

	 */

	d = pci_host_bridge_of_msi_domain(bus);



	return NULL;

	return d;

}



static void pci_set_bus_msi_domain(struct pci_bus *bus)

include/linux/pci.h

+4 −0
Original line number Diff line number Diff line
@@ -1841,10 +1841,12 @@ int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off, 
/* PCI <-> OF binding helpers */

#ifdef CONFIG_OF

struct device_node;

struct irq_domain;

void pci_set_of_node(struct pci_dev *dev);

void pci_release_of_node(struct pci_dev *dev);

void pci_set_bus_of_node(struct pci_bus *bus);

void pci_release_bus_of_node(struct pci_bus *bus);

struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);



/* Arch may override this (weak) */

struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
@@ -1867,6 +1869,8 @@ static inline void pci_set_bus_of_node(struct pci_bus *bus) { } 
static inline void pci_release_bus_of_node(struct pci_bus *bus) { }

static inline struct device_node *

pci_device_to_OF_node(const struct pci_dev *pdev) { return NULL; }

static inline struct irq_domain *

pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }

#endif  /* CONFIG_OF */



#ifdef CONFIG_EEH