Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755251AbbLJSQR (ORCPT ); Thu, 10 Dec 2015 13:16:17 -0500 Received: from foss.arm.com ([217.140.101.70]:56947 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755137AbbLJSQN (ORCPT ); Thu, 10 Dec 2015 13:16:13 -0500 Message-ID: <5669C169.2070504@arm.com> Date: Thu, 10 Dec 2015 18:16:09 +0000 From: Marc Zyngier Organization: ARM Ltd User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.7.0 MIME-Version: 1.0 To: jakeo@microsoft.com, gregkh@linuxfoundation.org, kys@microsoft.com, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, tglx@linutronix.de, haiyangz@microsoft.com, bhelgaas@google.com, linux-pci@vger.kernel.org Subject: Re: [PATCH v10 4/7] PCI: Add fwnode_handle to pci_sysdata References: <1449769983-12948-1-git-send-email-jakeo@microsoft.com> <1449769983-12948-5-git-send-email-jakeo@microsoft.com> In-Reply-To: <1449769983-12948-5-git-send-email-jakeo@microsoft.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3015 Lines: 97 On 10/12/15 17:53, jakeo@microsoft.com wrote: > From: Jake Oshins > > This patch adds an fwnode_handle to struct pci_sysdata, which is > used by the next patch in the series when trying to locate an > IRQ domain associated with a root PCI bus. > > Signed-off-by: Jake Oshins > --- > arch/x86/include/asm/pci.h | 15 +++++++++++++++ > drivers/pci/probe.c | 1 + > include/linux/pci.h | 4 ++++ > 3 files changed, 20 insertions(+) > > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h > index 4625943..6fc3c7c 100644 > --- a/arch/x86/include/asm/pci.h > +++ b/arch/x86/include/asm/pci.h > @@ -20,6 +20,9 @@ struct pci_sysdata { > #ifdef CONFIG_X86_64 > void *iommu; /* IOMMU private data */ > #endif > +#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN > + void *fwnode; /* IRQ domain for MSI assignment */ > +#endif > }; > > extern int pci_routeirq; > @@ -32,6 +35,7 @@ extern int noioapicreroute; > static inline int pci_domain_nr(struct pci_bus *bus) > { > struct pci_sysdata *sd = bus->sysdata; > + > return sd->domain; > } > > @@ -41,6 +45,17 @@ static inline int pci_proc_domain(struct pci_bus *bus) > } > #endif > > +#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN > +static inline void *_pci_root_bus_fwnode(struct pci_bus *bus) > +{ > + struct pci_sysdata *sd = bus->sysdata; > + > + return sd->fwnode; > +} > + > +#define pci_root_bus_fwnode _pci_root_bus_fwnode > +#endif > + > /* Can be used to override the logic in pci_scan_bus for skipping > already-configured bus numbers - to be used for buggy BIOSes > or architectures with incomplete PCI setup by the loader */ > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index edb1984..750f907 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include Nit: this should be with patch 5, but that doesn't hurt. I don't think you need to respin the series for this. > #include > #include "pci.h" > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 6ae25aa..b414422 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1517,6 +1517,10 @@ static inline int pci_get_new_domain_nr(void) { return -ENOSYS; } > > #include > > +#ifndef pci_root_bus_fwnode > +#define pci_root_bus_fwnode(bus) ((void)(bus), NULL) > +#endif > + > /* these helpers provide future and backwards compatibility > * for accessing popular PCI BAR info */ > #define pci_resource_start(dev, bar) ((dev)->resource[(bar)].start) > Reviewed-by: Marc Zyngier M. -- Jazz is not dead. It just smells funny... -- 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/