From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932179AbbA0Al1 (ORCPT ); Mon, 26 Jan 2015 19:41:27 -0500 Received: from mail-oi0-f41.google.com ([209.85.218.41]:46377 "EHLO mail-oi0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755476AbbA0AlX (ORCPT ); Mon, 26 Jan 2015 19:41:23 -0500 Date: Mon, 26 Jan 2015 18:41:20 -0600 From: Bjorn Helgaas To: Marc Zyngier Cc: Thomas Gleixner , Jiang Liu , linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon , Yijing Wang , Suravee Suthikulpanit Subject: Re: [PATCH 3/6] PCI/MSI: of: add support for OF-provided msi_domain Message-ID: <20150127004120.GD11624@google.com> References: <1418069543-21969-1-git-send-email-marc.zyngier@arm.com> <1418069543-21969-4-git-send-email-marc.zyngier@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1418069543-21969-4-git-send-email-marc.zyngier@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 08, 2014 at 08:12:20PM +0000, 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. > > Signed-off-by: Marc Zyngier > --- > drivers/pci/of.c | 15 +++++++++++++++ > drivers/pci/probe.c | 1 + > include/linux/pci.h | 2 ++ > 3 files changed, 18 insertions(+) > > 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 > #include > #include > #include > @@ -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) Same "phb" comment as before (also in the changelog above). > +{ > +#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 d1009a2..65600e5 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -672,6 +672,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 3266764..6a9713f 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1825,6 +1825,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); > @@ -1845,6 +1846,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) {} Add a space between the braces to match the others. > #endif /* CONFIG_OF */ > > #ifdef CONFIG_EEH > -- > 2.1.3 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: bhelgaas@google.com (Bjorn Helgaas) Date: Mon, 26 Jan 2015 18:41:20 -0600 Subject: [PATCH 3/6] PCI/MSI: of: add support for OF-provided msi_domain In-Reply-To: <1418069543-21969-4-git-send-email-marc.zyngier@arm.com> References: <1418069543-21969-1-git-send-email-marc.zyngier@arm.com> <1418069543-21969-4-git-send-email-marc.zyngier@arm.com> Message-ID: <20150127004120.GD11624@google.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Dec 08, 2014 at 08:12:20PM +0000, 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. > > Signed-off-by: Marc Zyngier > --- > drivers/pci/of.c | 15 +++++++++++++++ > drivers/pci/probe.c | 1 + > include/linux/pci.h | 2 ++ > 3 files changed, 18 insertions(+) > > 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 > #include > #include > #include > @@ -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) Same "phb" comment as before (also in the changelog above). > +{ > +#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 d1009a2..65600e5 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -672,6 +672,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 3266764..6a9713f 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1825,6 +1825,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); > @@ -1845,6 +1846,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) {} Add a space between the braces to match the others. > #endif /* CONFIG_OF */ > > #ifdef CONFIG_EEH > -- > 2.1.3 >