Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753142AbbGOMRP (ORCPT ); Wed, 15 Jul 2015 08:17:15 -0400 Received: from foss.arm.com ([217.140.101.70]:38681 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752825AbbGOMRL (ORCPT ); Wed, 15 Jul 2015 08:17:11 -0400 From: Marc Zyngier To: Bjorn Helgaas , Thomas Gleixner , Jiang Liu , Jason Cooper Cc: , , , Yijing Wang , Ma Jun , Lorenzo Pieralisi , Duc Dang Subject: [PATCH v4 05/19] PCI/MSI: of: Add support for OF-provided msi_domain Date: Wed, 15 Jul 2015 13:16:39 +0100 Message-Id: <1436962613-17359-6-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436962613-17359-1-git-send-email-marc.zyngier@arm.com> References: <1436962613-17359-1-git-send-email-marc.zyngier@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2781 Lines: 87 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 --- drivers/pci/of.c | 19 +++++++++++++++++++ drivers/pci/probe.c | 1 + include/linux/pci.h | 2 ++ 3 files changed, 22 insertions(+) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index f092993..09df465 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 #include #include #include @@ -59,3 +60,21 @@ 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; + struct irq_domain *d; + + if (!bus->dev.of_node) + return; + np = of_parse_phandle(bus->dev.of_node, "msi-parent", 0); + if (!np) + return; + d = irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI); + if (!d) + d = irq_find_host(np); + dev_set_msi_domain(&bus->dev, d); +#endif +} diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 376f6fa..c80626f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -663,6 +663,7 @@ static void pci_set_bus_speed(struct pci_bus *bus) void __weak pcibios_set_host_bridge_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 fe0825f..b3ad3d4 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1846,6 +1846,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); @@ -1868,6 +1869,7 @@ 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 void pci_set_phb_of_msi_domain(struct pci_bus *bus) { } #endif /* CONFIG_OF */ #ifdef CONFIG_EEH -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/