| Message ID | 1420736772-11088-4-git-send-email-marc.zyngier@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On 2015/1/9 1:06, Marc Zyngier wrote: > In order to populate the PHB 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. > Hi Marc, Since the whole patch series based on the fact that non PCI type buses will use MSI-like interrupts, would it be better if getting this field settled during OF populating? Regards, Abel -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Abel, On 14/01/15 08:17, Yun Wu (Abel) wrote: > On 2015/1/9 1:06, Marc Zyngier wrote: > >> In order to populate the PHB 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. >> > > Hi Marc, > > Since the whole patch series based on the fact that non PCI type > buses will use MSI-like interrupts, would it be better if getting > this field settled during OF populating? Are you're thinking of letting random platform devices automagically gain an MSI domain as they are discovered by DT? I feel like you looking at it the wrong way. Note that DT discovery doesn't imply a particular bus, and non-PCI doesn't mean bus-agnostic. MSI-like interrupts really are a bus property, and I'd rather see you implementing support for your favourite bus (and do the MSI domain matching there). Thanks, M.
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index f092993..d8d1274 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -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,17 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus) return of_node_get(bus->bridge->parent->of_node); return NULL; } + +void pci_set_phb_of_msi_domain(struct pci_bus *bus) +{ +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN + struct device_node *np; + + if (!bus->dev.of_node) + return; + np = of_parse_phandle(bus->dev.of_node, "msi-parent", 0); + if (!np) + return; + dev_set_msi_domain(&bus->dev, irq_find_host(np)); +#endif +} diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 977c079..82fbd12 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -662,6 +662,7 @@ static void pci_set_bus_speed(struct pci_bus *bus) void __weak pcibios_set_phb_msi_domain(struct pci_bus *bus) { + pci_set_phb_of_msi_domain(bus); } static void pci_set_bus_msi_domain(struct pci_bus *bus) diff --git a/include/linux/pci.h b/include/linux/pci.h index 13c65ab..66c493e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1828,6 +1828,7 @@ 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); +void pci_set_phb_of_msi_domain(struct pci_bus *bus); /* Arch may override this (weak) */ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus); @@ -1848,6 +1849,7 @@ static inline void pci_set_of_node(struct pci_dev *dev) { } static inline void pci_release_of_node(struct pci_dev *dev) { } 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 void pci_set_phb_of_msi_domain(struct pci_bus *bus) {} #endif /* CONFIG_OF */ #ifdef CONFIG_EEH
In order to populate the PHB 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. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- drivers/pci/of.c | 15 +++++++++++++++ drivers/pci/probe.c | 1 + include/linux/pci.h | 2 ++ 3 files changed, 18 insertions(+)