[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5669C169.2070504@arm.com>
Date: Thu, 10 Dec 2015 18:16:09 +0000
From: Marc Zyngier <marc.zyngier@....com>
To: jakeo@...rosoft.com, gregkh@...uxfoundation.org, kys@...rosoft.com,
linux-kernel@...r.kernel.org, devel@...uxdriverproject.org,
olaf@...fle.de, apw@...onical.com, vkuznets@...hat.com,
tglx@...utronix.de, haiyangz@...rosoft.com, bhelgaas@...gle.com,
linux-pci@...r.kernel.org
Subject: Re: [PATCH v10 4/7] PCI: Add fwnode_handle to pci_sysdata
On 10/12/15 17:53, jakeo@...rosoft.com wrote:
> From: Jake Oshins <jakeo@...rosoft.com>
>
> 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 <jakeo@...rosoft.com>
> ---
> 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 <linux/pci-aspm.h>
> #include <linux/aer.h>
> #include <linux/acpi.h>
> +#include <linux/irqdomain.h>
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 <asm-generic/pci-bridge.h>
> #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 <asm/pci.h>
>
> +#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 <marc.zyngier@....com>
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists