* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-30 11:44 ` [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains Lorenzo Pieralisi
@ 2014-10-30 11:55 ` Arnd Bergmann
2014-10-30 16:20 ` Lorenzo Pieralisi
2014-10-30 12:27 ` Yijing Wang
` (3 subsequent siblings)
4 siblings, 1 reply; 32+ messages in thread
From: Arnd Bergmann @ 2014-10-30 11:55 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Lorenzo Pieralisi, linux-pci, Phil Edworthy, Russell King,
Mohit Kumar, Jingoo Han, liviu.dudau, Jason Gunthorpe,
Bjorn Helgaas
On Thursday 30 October 2014 11:44:48 Lorenzo Pieralisi wrote:
> Most if not all ARM PCI host controller device drivers either ignore the
> domain field in the pci_sys_data structure or just increment it every
> time a host controller is probed, using it as a domain counter.
>
> Therefore, instead of relying on pci_sys_data to stash the domain number
> in a standard location, ARM pcibios code can be moved to the newly
> introduced generic PCI domains code, implemented in commits:
>
> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
>
> commit 670ba0c8883b576d0aec28bd7a838358a4be1
> ("PCI: Add generic domain handling")
>
> In order to assign a domain number dynamically, the ARM pcibios defines
> the function, called by core PCI code:
>
> void pci_bus_assign_domain_nr(...)
>
> that relies on a DT property to define the domain number or falls back to
> a counter; its usage replaces the current domain assignment code in PCI
> host controllers present in the kernel.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Jingoo Han <jg1.han@samsung.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Mohit Kumar <mohit.kumar@st.com>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Very nice!
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-30 11:55 ` Arnd Bergmann
@ 2014-10-30 16:20 ` Lorenzo Pieralisi
0 siblings, 0 replies; 32+ messages in thread
From: Lorenzo Pieralisi @ 2014-10-30 16:20 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-pci, Phil Edworthy, Russell King,
Mohit Kumar, Jingoo Han, Liviu Dudau, Jason Gunthorpe,
Bjorn Helgaas
On Thu, Oct 30, 2014 at 11:55:31AM +0000, Arnd Bergmann wrote:
> On Thursday 30 October 2014 11:44:48 Lorenzo Pieralisi wrote:
> > Most if not all ARM PCI host controller device drivers either ignore the
> > domain field in the pci_sys_data structure or just increment it every
> > time a host controller is probed, using it as a domain counter.
> >
> > Therefore, instead of relying on pci_sys_data to stash the domain number
> > in a standard location, ARM pcibios code can be moved to the newly
> > introduced generic PCI domains code, implemented in commits:
> >
> > commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> > ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
> >
> > commit 670ba0c8883b576d0aec28bd7a838358a4be1
> > ("PCI: Add generic domain handling")
> >
> > In order to assign a domain number dynamically, the ARM pcibios defines
> > the function, called by core PCI code:
> >
> > void pci_bus_assign_domain_nr(...)
> >
> > that relies on a DT property to define the domain number or falls back to
> > a counter; its usage replaces the current domain assignment code in PCI
> > host controllers present in the kernel.
> >
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Phil Edworthy <phil.edworthy@renesas.com>
> > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > Cc: Jingoo Han <jg1.han@samsung.com>
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Cc: Mohit Kumar <mohit.kumar@st.com>
> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> >
>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
>
> Very nice!
Thank you very much, I would be grateful if Jason, Jingoo, and Phil can
give the patch a go on the respective platforms and hopefully I will add
their tested-by tags.
I guess pci_sys_data.add_bus pointer is the next to go :)
Lorenzo
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-30 11:44 ` [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains Lorenzo Pieralisi
2014-10-30 11:55 ` Arnd Bergmann
@ 2014-10-30 12:27 ` Yijing Wang
2014-10-30 16:21 ` Lorenzo Pieralisi
2014-10-31 13:43 ` Phil Edworthy
` (2 subsequent siblings)
4 siblings, 1 reply; 32+ messages in thread
From: Yijing Wang @ 2014-10-30 12:27 UTC (permalink / raw)
To: Lorenzo Pieralisi, linux-arm-kernel, linux-pci
Cc: liviu.dudau, Arnd Bergmann, Phil Edworthy, Jason Gunthorpe,
Jingoo Han, Bjorn Helgaas, Russell King, Mohit Kumar
On 2014/10/30 19:44, Lorenzo Pieralisi wrote:
> Most if not all ARM PCI host controller device drivers either ignore the
> domain field in the pci_sys_data structure or just increment it every
> time a host controller is probed, using it as a domain counter.
>
> Therefore, instead of relying on pci_sys_data to stash the domain number
> in a standard location, ARM pcibios code can be moved to the newly
> introduced generic PCI domains code, implemented in commits:
>
> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
>
> commit 670ba0c8883b576d0aec28bd7a838358a4be1
> ("PCI: Add generic domain handling")
>
> In order to assign a domain number dynamically, the ARM pcibios defines
> the function, called by core PCI code:
>
> void pci_bus_assign_domain_nr(...)
>
> that relies on a DT property to define the domain number or falls back to
> a counter; its usage replaces the current domain assignment code in PCI
> host controllers present in the kernel.
Nice clean up.
Reviewed-by: Yijing Wang <wangyijing@huawei.com>
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Jingoo Han <jg1.han@samsung.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Mohit Kumar <mohit.kumar@st.com>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> ---
> arch/arm/Kconfig | 3 +++
> arch/arm/include/asm/mach/pci.h | 3 ---
> arch/arm/include/asm/pci.h | 7 -------
> arch/arm/kernel/bios32.c | 26 +++++++++++++++++++++++---
> drivers/pci/host/pci-mvebu.c | 10 ++--------
> drivers/pci/host/pcie-designware.c | 3 ---
> drivers/pci/host/pcie-rcar.c | 3 ---
> 7 files changed, 28 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 89c4b5c..29544f0 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1292,6 +1292,9 @@ config PCI_DOMAINS
> bool
> depends on PCI
>
> +config PCI_DOMAINS_GENERIC
> + def_bool PCI_DOMAINS
> +
> config PCI_NANOENGINE
> bool "BSE nanoEngine PCI support"
> depends on SA1100_NANOENGINE
> diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
> index 7fc4278..f19f627 100644
> --- a/arch/arm/include/asm/mach/pci.h
> +++ b/arch/arm/include/asm/mach/pci.h
> @@ -44,9 +44,6 @@ struct hw_pci {
> * Per-controller structure
> */
> struct pci_sys_data {
> -#ifdef CONFIG_PCI_DOMAINS
> - int domain;
> -#endif
> struct list_head node;
> int busnr; /* primary bus number */
> u64 mem_offset; /* bus->cpu memory mapping offset */
> diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
> index 7e95d85..585dc33 100644
> --- a/arch/arm/include/asm/pci.h
> +++ b/arch/arm/include/asm/pci.h
> @@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void)
> }
>
> #ifdef CONFIG_PCI_DOMAINS
> -static inline int pci_domain_nr(struct pci_bus *bus)
> -{
> - struct pci_sys_data *root = bus->sysdata;
> -
> - return root->domain;
> -}
> -
> static inline int pci_proc_domain(struct pci_bus *bus)
> {
> return pci_domain_nr(bus);
> diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
> index 17a26c1..d8c2b4e 100644
> --- a/arch/arm/kernel/bios32.c
> +++ b/arch/arm/kernel/bios32.c
> @@ -11,6 +11,8 @@
> #include <linux/slab.h>
> #include <linux/init.h>
> #include <linux/io.h>
> +#include <linux/of.h>
> +#include <linux/of_pci.h>
>
> #include <asm/mach-types.h>
> #include <asm/mach/map.h>
> @@ -468,9 +470,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> if (!sys)
> panic("PCI: unable to allocate sys data!");
>
> -#ifdef CONFIG_PCI_DOMAINS
> - sys->domain = hw->domain;
> -#endif
> sys->busnr = busnr;
> sys->swizzle = hw->swizzle;
> sys->map_irq = hw->map_irq;
> @@ -511,6 +510,27 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> }
> }
>
> +#ifdef CONFIG_PCI_DOMAINS_GENERIC
> +static bool dt_domain_found;
> +
> +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
> +{
> + int domain = of_get_pci_domain_nr(parent->of_node);
> +
> + if (domain >= 0) {
> + dt_domain_found = true;
> + } else if (dt_domain_found == true) {
> + dev_err(parent, "Node %s is missing \"linux,pci-domain\" property in DT\n",
> + parent->of_node->full_name);
> + return;
> + } else {
> + domain = pci_get_new_domain_nr();
> + }
> +
> + bus->domain_nr = domain;
> +}
> +#endif
> +
> void pci_common_init_dev(struct device *parent, struct hw_pci *hw)
> {
> struct pci_sys_data *sys;
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index b1315e1..2b4c1f2 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -722,17 +722,11 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
> {
> struct mvebu_pcie *pcie = sys_to_pcie(sys);
> int i;
> - int domain = 0;
>
> -#ifdef CONFIG_PCI_DOMAINS
> - domain = sys->domain;
> -#endif
> -
> - snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
> - domain);
> + snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x", nr);
> pcie->mem.name = pcie->mem_name;
>
> - snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", domain);
> + snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", nr);
> pcie->realio.name = pcie->io_name;
>
> if (request_resource(&iomem_resource, &pcie->mem))
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> index dfed00a..6790b87 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -502,9 +502,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
> dw_pci.private_data = (void **)&pp;
>
> pci_common_init_dev(pp->dev, &dw_pci);
> -#ifdef CONFIG_PCI_DOMAINS
> - dw_pci.domain++;
> -#endif
>
> return 0;
> }
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 61158e0..b6b859e 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -404,9 +404,6 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie)
> rcar_pci.private_data = (void **)&pcie;
>
> pci_common_init_dev(&pdev->dev, &rcar_pci);
> -#ifdef CONFIG_PCI_DOMAINS
> - rcar_pci.domain++;
> -#endif
> }
>
> static int phy_wait_for_ack(struct rcar_pcie *pcie)
>
--
Thanks!
Yijing
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-30 12:27 ` Yijing Wang
@ 2014-10-30 16:21 ` Lorenzo Pieralisi
0 siblings, 0 replies; 32+ messages in thread
From: Lorenzo Pieralisi @ 2014-10-30 16:21 UTC (permalink / raw)
To: Yijing Wang
Cc: linux-arm-kernel, linux-pci, Liviu Dudau, Arnd Bergmann,
Phil Edworthy, Jason Gunthorpe, Jingoo Han, Bjorn Helgaas,
Russell King, Mohit Kumar
On Thu, Oct 30, 2014 at 12:27:13PM +0000, Yijing Wang wrote:
> On 2014/10/30 19:44, Lorenzo Pieralisi wrote:
> > Most if not all ARM PCI host controller device drivers either ignore the
> > domain field in the pci_sys_data structure or just increment it every
> > time a host controller is probed, using it as a domain counter.
> >
> > Therefore, instead of relying on pci_sys_data to stash the domain number
> > in a standard location, ARM pcibios code can be moved to the newly
> > introduced generic PCI domains code, implemented in commits:
> >
> > commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> > ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
> >
> > commit 670ba0c8883b576d0aec28bd7a838358a4be1
> > ("PCI: Add generic domain handling")
> >
> > In order to assign a domain number dynamically, the ARM pcibios defines
> > the function, called by core PCI code:
> >
> > void pci_bus_assign_domain_nr(...)
> >
> > that relies on a DT property to define the domain number or falls back to
> > a counter; its usage replaces the current domain assignment code in PCI
> > host controllers present in the kernel.
>
> Nice clean up.
>
> Reviewed-by: Yijing Wang <wangyijing@huawei.com>
Thank you Yijing !
Lorenzo
^ permalink raw reply [flat|nested] 32+ messages in thread
* RE: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-30 11:44 ` [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains Lorenzo Pieralisi
2014-10-30 11:55 ` Arnd Bergmann
2014-10-30 12:27 ` Yijing Wang
@ 2014-10-31 13:43 ` Phil Edworthy
2014-10-31 16:37 ` Bjorn Helgaas
2014-11-03 11:06 ` Lorenzo Pieralisi
2014-11-03 1:18 ` Jingoo Han
2014-11-03 3:48 ` Yijing Wang
4 siblings, 2 replies; 32+ messages in thread
From: Phil Edworthy @ 2014-10-31 13:43 UTC (permalink / raw)
To: Lorenzo Pieralisi, linux-arm-kernel, linux-pci
Cc: liviu.dudau, Arnd Bergmann, Jason Gunthorpe, Jingoo Han,
Bjorn Helgaas, Russell King, Mohit Kumar, Simon Horman
Hi Lorenzo,
On 30 October 2014 11:45, Lorenzo wrote:
> Most if not all ARM PCI host controller device drivers either ignore the
> domain field in the pci_sys_data structure or just increment it every
> time a host controller is probed, using it as a domain counter.
>
> Therefore, instead of relying on pci_sys_data to stash the domain number
> in a standard location, ARM pcibios code can be moved to the newly
> introduced generic PCI domains code, implemented in commits:
>
> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
>
> commit 670ba0c8883b576d0aec28bd7a838358a4be1
> ("PCI: Add generic domain handling")
>
> In order to assign a domain number dynamically, the ARM pcibios defines
> the function, called by core PCI code:
>
> void pci_bus_assign_domain_nr(...)
>
> that relies on a DT property to define the domain number or falls back to
> a counter; its usage replaces the current domain assignment code in PCI
> host controllers present in the kernel.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Jingoo Han <jg1.han@samsung.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Mohit Kumar <mohit.kumar@st.com>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
This patch fixes a current problem with R-Car devices where there is an
internal PCI bridge and an external PCIe bridge on the devices. Both drivers
work independently but need to be on different domains. Just needed to enable
PCI_DOMAINS along with this.
I've done basic testing that the internal PCI and external PCIe work at the
same time.
Acked-by: Phil Edworthy <phil.edworthy@renesas.com>
Thanks
Phil
> ---
> arch/arm/Kconfig | 3 +++
> arch/arm/include/asm/mach/pci.h | 3 ---
> arch/arm/include/asm/pci.h | 7 -------
> arch/arm/kernel/bios32.c | 26 +++++++++++++++++++++++---
> drivers/pci/host/pci-mvebu.c | 10 ++--------
> drivers/pci/host/pcie-designware.c | 3 ---
> drivers/pci/host/pcie-rcar.c | 3 ---
> 7 files changed, 28 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 89c4b5c..29544f0 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1292,6 +1292,9 @@ config PCI_DOMAINS
> bool
> depends on PCI
>
> +config PCI_DOMAINS_GENERIC
> + def_bool PCI_DOMAINS
> +
> config PCI_NANOENGINE
> bool "BSE nanoEngine PCI support"
> depends on SA1100_NANOENGINE
> diff --git a/arch/arm/include/asm/mach/pci.h
> b/arch/arm/include/asm/mach/pci.h
> index 7fc4278..f19f627 100644
> --- a/arch/arm/include/asm/mach/pci.h
> +++ b/arch/arm/include/asm/mach/pci.h
> @@ -44,9 +44,6 @@ struct hw_pci {
> * Per-controller structure
> */
> struct pci_sys_data {
> -#ifdef CONFIG_PCI_DOMAINS
> - int domain;
> -#endif
> struct list_head node;
> int busnr; /* primary bus number */
> u64 mem_offset; /* bus->cpu memory mapping offset */
> diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
> index 7e95d85..585dc33 100644
> --- a/arch/arm/include/asm/pci.h
> +++ b/arch/arm/include/asm/pci.h
> @@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void)
> }
>
> #ifdef CONFIG_PCI_DOMAINS
> -static inline int pci_domain_nr(struct pci_bus *bus)
> -{
> - struct pci_sys_data *root = bus->sysdata;
> -
> - return root->domain;
> -}
> -
> static inline int pci_proc_domain(struct pci_bus *bus)
> {
> return pci_domain_nr(bus);
> diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
> index 17a26c1..d8c2b4e 100644
> --- a/arch/arm/kernel/bios32.c
> +++ b/arch/arm/kernel/bios32.c
> @@ -11,6 +11,8 @@
> #include <linux/slab.h>
> #include <linux/init.h>
> #include <linux/io.h>
> +#include <linux/of.h>
> +#include <linux/of_pci.h>
>
> #include <asm/mach-types.h>
> #include <asm/mach/map.h>
> @@ -468,9 +470,6 @@ static void pcibios_init_hw(struct device *parent, struct
> hw_pci *hw,
> if (!sys)
> panic("PCI: unable to allocate sys data!");
>
> -#ifdef CONFIG_PCI_DOMAINS
> - sys->domain = hw->domain;
> -#endif
> sys->busnr = busnr;
> sys->swizzle = hw->swizzle;
> sys->map_irq = hw->map_irq;
> @@ -511,6 +510,27 @@ static void pcibios_init_hw(struct device *parent, struct
> hw_pci *hw,
> }
> }
>
> +#ifdef CONFIG_PCI_DOMAINS_GENERIC
> +static bool dt_domain_found;
> +
> +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
> +{
> + int domain = of_get_pci_domain_nr(parent->of_node);
> +
> + if (domain >= 0) {
> + dt_domain_found = true;
> + } else if (dt_domain_found == true) {
> + dev_err(parent, "Node %s is missing \"linux,pci-domain\"
> property in DT\n",
> + parent->of_node->full_name);
> + return;
> + } else {
> + domain = pci_get_new_domain_nr();
> + }
> +
> + bus->domain_nr = domain;
> +}
> +#endif
> +
> void pci_common_init_dev(struct device *parent, struct hw_pci *hw)
> {
> struct pci_sys_data *sys;
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index b1315e1..2b4c1f2 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -722,17 +722,11 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data
> *sys)
> {
> struct mvebu_pcie *pcie = sys_to_pcie(sys);
> int i;
> - int domain = 0;
>
> -#ifdef CONFIG_PCI_DOMAINS
> - domain = sys->domain;
> -#endif
> -
> - snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
> - domain);
> + snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
> nr);
> pcie->mem.name = pcie->mem_name;
>
> - snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x",
> domain);
> + snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", nr);
> pcie->realio.name = pcie->io_name;
>
> if (request_resource(&iomem_resource, &pcie->mem))
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-
> designware.c
> index dfed00a..6790b87 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -502,9 +502,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
> dw_pci.private_data = (void **)&pp;
>
> pci_common_init_dev(pp->dev, &dw_pci);
> -#ifdef CONFIG_PCI_DOMAINS
> - dw_pci.domain++;
> -#endif
>
> return 0;
> }
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 61158e0..b6b859e 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -404,9 +404,6 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie)
> rcar_pci.private_data = (void **)&pcie;
>
> pci_common_init_dev(&pdev->dev, &rcar_pci);
> -#ifdef CONFIG_PCI_DOMAINS
> - rcar_pci.domain++;
> -#endif
> }
>
> static int phy_wait_for_ack(struct rcar_pcie *pcie)
> --
> 2.1.2
>
> --
> 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
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-31 13:43 ` Phil Edworthy
@ 2014-10-31 16:37 ` Bjorn Helgaas
2014-10-31 17:04 ` Phil Edworthy
2014-11-03 11:06 ` Lorenzo Pieralisi
1 sibling, 1 reply; 32+ messages in thread
From: Bjorn Helgaas @ 2014-10-31 16:37 UTC (permalink / raw)
To: Phil Edworthy
Cc: Lorenzo Pieralisi, linux-arm-kernel, linux-pci, liviu.dudau,
Arnd Bergmann, Jason Gunthorpe, Jingoo Han, Russell King,
Mohit Kumar, Simon Horman
On Fri, Oct 31, 2014 at 7:43 AM, Phil Edworthy
<phil.edworthy@renesas.com> wrote:
> Hi Lorenzo,
>
> On 30 October 2014 11:45, Lorenzo wrote:
>> Most if not all ARM PCI host controller device drivers either ignore the
>> domain field in the pci_sys_data structure or just increment it every
>> time a host controller is probed, using it as a domain counter.
>>
>> Therefore, instead of relying on pci_sys_data to stash the domain number
>> in a standard location, ARM pcibios code can be moved to the newly
>> introduced generic PCI domains code, implemented in commits:
>>
>> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
>> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
>>
>> commit 670ba0c8883b576d0aec28bd7a838358a4be1
>> ("PCI: Add generic domain handling")
>>
>> In order to assign a domain number dynamically, the ARM pcibios defines
>> the function, called by core PCI code:
>>
>> void pci_bus_assign_domain_nr(...)
>>
>> that relies on a DT property to define the domain number or falls back to
>> a counter; its usage replaces the current domain assignment code in PCI
>> host controllers present in the kernel.
>>
>> Cc: Arnd Bergmann <arnd@arndb.de>
>> Cc: Phil Edworthy <phil.edworthy@renesas.com>
>> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
>> Cc: Jingoo Han <jg1.han@samsung.com>
>> Cc: Bjorn Helgaas <bhelgaas@google.com>
>> Cc: Russell King <linux@arm.linux.org.uk>
>> Cc: Mohit Kumar <mohit.kumar@st.com>
>> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>
> This patch fixes a current problem with R-Car devices where there is an
> internal PCI bridge and an external PCIe bridge on the devices. Both drivers
> work independently but need to be on different domains. Just needed to enable
> PCI_DOMAINS along with this.
> I've done basic testing that the internal PCI and external PCIe work at the
> same time.
Hi Phil,
Thanks for testing this. Can you give me some more guidance on where
you'd like to see this merged? Until your comment about this fixing a
current problem on R-Car, I probably would have considered this to be
a cleanup and enhancement and hence material for v3.19. But if R-Car
is actually broken and this fixes it, maybe this should go in for
v3.18 instead.
If it is currently broken, is there a point where it broke? I assume
it used to work at one time. If there's a commit that broke it, it
would be nice to reference that in the changelog and explain exactly
what was broken and how this fixes it.
Bjorn
^ permalink raw reply [flat|nested] 32+ messages in thread* RE: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-31 16:37 ` Bjorn Helgaas
@ 2014-10-31 17:04 ` Phil Edworthy
2014-11-03 23:26 ` Simon Horman
0 siblings, 1 reply; 32+ messages in thread
From: Phil Edworthy @ 2014-10-31 17:04 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Lorenzo Pieralisi, linux-arm-kernel, linux-pci, liviu.dudau,
Arnd Bergmann, Jason Gunthorpe, Jingoo Han, Russell King,
Mohit Kumar, Simon Horman
SGkgQmpvcm4sDQoNCk9uIDMxIE9jdG9iZXIgMjAxNCAxNjozNywgQmpvcm4gd3JvdGU6DQo+IE9u
IEZyaSwgT2N0IDMxLCAyMDE0IGF0IDc6NDMgQU0sIFBoaWwgRWR3b3J0aHkNCj4gPHBoaWwuZWR3
b3J0aHlAcmVuZXNhcy5jb20+IHdyb3RlOg0KPiA+IEhpIExvcmVuem8sDQo+ID4NCj4gPiBPbiAz
MCBPY3RvYmVyIDIwMTQgMTE6NDUsIExvcmVuem8gd3JvdGU6DQo+ID4+IE1vc3QgaWYgbm90IGFs
bCBBUk0gUENJIGhvc3QgY29udHJvbGxlciBkZXZpY2UgZHJpdmVycyBlaXRoZXIgaWdub3JlIHRo
ZQ0KPiA+PiBkb21haW4gZmllbGQgaW4gdGhlIHBjaV9zeXNfZGF0YSBzdHJ1Y3R1cmUgb3IganVz
dCBpbmNyZW1lbnQgaXQgZXZlcnkNCj4gPj4gdGltZSBhIGhvc3QgY29udHJvbGxlciBpcyBwcm9i
ZWQsIHVzaW5nIGl0IGFzIGEgZG9tYWluIGNvdW50ZXIuDQo+ID4+DQo+ID4+IFRoZXJlZm9yZSwg
aW5zdGVhZCBvZiByZWx5aW5nIG9uIHBjaV9zeXNfZGF0YSB0byBzdGFzaCB0aGUgZG9tYWluIG51
bWJlcg0KPiA+PiBpbiBhIHN0YW5kYXJkIGxvY2F0aW9uLCBBUk0gcGNpYmlvcyBjb2RlIGNhbiBi
ZSBtb3ZlZCB0byB0aGUgbmV3bHkNCj4gPj4gaW50cm9kdWNlZCBnZW5lcmljIFBDSSBkb21haW5z
IGNvZGUsIGltcGxlbWVudGVkIGluIGNvbW1pdHM6DQo+ID4+DQo+ID4+IGNvbW1pdCA0MWU1YzBm
ODFkM2U2NzZkNjcxZDk2YTBhMWZhZmIyN2FiZmJkOQ0KPiA+PiAoIm9mL3BjaTogQWRkIHBjaV9n
ZXRfbmV3X2RvbWFpbl9ucigpIGFuZCBvZl9nZXRfcGNpX2RvbWFpbl9ucigpIikNCj4gPj4NCj4g
Pj4gY29tbWl0IDY3MGJhMGM4ODgzYjU3NmQwYWVjMjhiZDdhODM4MzU4YTRiZTENCj4gPj4gKCJQ
Q0k6IEFkZCBnZW5lcmljIGRvbWFpbiBoYW5kbGluZyIpDQo+ID4+DQo+ID4+IEluIG9yZGVyIHRv
IGFzc2lnbiBhIGRvbWFpbiBudW1iZXIgZHluYW1pY2FsbHksIHRoZSBBUk0gcGNpYmlvcyBkZWZp
bmVzDQo+ID4+IHRoZSBmdW5jdGlvbiwgY2FsbGVkIGJ5IGNvcmUgUENJIGNvZGU6DQo+ID4+DQo+
ID4+IHZvaWQgcGNpX2J1c19hc3NpZ25fZG9tYWluX25yKC4uLikNCj4gPj4NCj4gPj4gdGhhdCBy
ZWxpZXMgb24gYSBEVCBwcm9wZXJ0eSB0byBkZWZpbmUgdGhlIGRvbWFpbiBudW1iZXIgb3IgZmFs
bHMgYmFjayB0bw0KPiA+PiBhIGNvdW50ZXI7IGl0cyB1c2FnZSByZXBsYWNlcyB0aGUgY3VycmVu
dCBkb21haW4gYXNzaWdubWVudCBjb2RlIGluIFBDSQ0KPiA+PiBob3N0IGNvbnRyb2xsZXJzIHBy
ZXNlbnQgaW4gdGhlIGtlcm5lbC4NCj4gPj4NCj4gPj4gQ2M6IEFybmQgQmVyZ21hbm4gPGFybmRA
YXJuZGIuZGU+DQo+ID4+IENjOiBQaGlsIEVkd29ydGh5IDxwaGlsLmVkd29ydGh5QHJlbmVzYXMu
Y29tPg0KPiA+PiBDYzogSmFzb24gR3VudGhvcnBlIDxqZ3VudGhvcnBlQG9ic2lkaWFucmVzZWFy
Y2guY29tPg0KPiA+PiBDYzogSmluZ29vIEhhbiA8amcxLmhhbkBzYW1zdW5nLmNvbT4NCj4gPj4g
Q2M6IEJqb3JuIEhlbGdhYXMgPGJoZWxnYWFzQGdvb2dsZS5jb20+DQo+ID4+IENjOiBSdXNzZWxs
IEtpbmcgPGxpbnV4QGFybS5saW51eC5vcmcudWs+DQo+ID4+IENjOiBNb2hpdCBLdW1hciA8bW9o
aXQua3VtYXJAc3QuY29tPg0KPiA+PiBTaWduZWQtb2ZmLWJ5OiBMb3JlbnpvIFBpZXJhbGlzaSA8
bG9yZW56by5waWVyYWxpc2lAYXJtLmNvbT4NCj4gPg0KPiA+IFRoaXMgcGF0Y2ggZml4ZXMgYSBj
dXJyZW50IHByb2JsZW0gd2l0aCBSLUNhciBkZXZpY2VzIHdoZXJlIHRoZXJlIGlzIGFuDQo+ID4g
aW50ZXJuYWwgUENJIGJyaWRnZSBhbmQgYW4gZXh0ZXJuYWwgUENJZSBicmlkZ2Ugb24gdGhlIGRl
dmljZXMuIEJvdGggZHJpdmVycw0KPiA+IHdvcmsgaW5kZXBlbmRlbnRseSBidXQgbmVlZCB0byBi
ZSBvbiBkaWZmZXJlbnQgZG9tYWlucy4gSnVzdCBuZWVkZWQgdG8NCj4gZW5hYmxlDQo+ID4gUENJ
X0RPTUFJTlMgYWxvbmcgd2l0aCB0aGlzLg0KPiA+IEkndmUgZG9uZSBiYXNpYyB0ZXN0aW5nIHRo
YXQgdGhlIGludGVybmFsIFBDSSBhbmQgZXh0ZXJuYWwgUENJZSB3b3JrIGF0IHRoZQ0KPiA+IHNh
bWUgdGltZS4NCj4gDQo+IEhpIFBoaWwsDQo+IA0KPiBUaGFua3MgZm9yIHRlc3RpbmcgdGhpcy4g
IENhbiB5b3UgZ2l2ZSBtZSBzb21lIG1vcmUgZ3VpZGFuY2Ugb24gd2hlcmUNCj4geW91J2QgbGlr
ZSB0byBzZWUgdGhpcyBtZXJnZWQ/ICBVbnRpbCB5b3VyIGNvbW1lbnQgYWJvdXQgdGhpcyBmaXhp
bmcgYQ0KPiBjdXJyZW50IHByb2JsZW0gb24gUi1DYXIsIEkgcHJvYmFibHkgd291bGQgaGF2ZSBj
b25zaWRlcmVkIHRoaXMgdG8gYmUNCj4gYSBjbGVhbnVwIGFuZCBlbmhhbmNlbWVudCBhbmQgaGVu
Y2UgbWF0ZXJpYWwgZm9yIHYzLjE5LiAgQnV0IGlmIFItQ2FyDQo+IGlzIGFjdHVhbGx5IGJyb2tl
biBhbmQgdGhpcyBmaXhlcyBpdCwgbWF5YmUgdGhpcyBzaG91bGQgZ28gaW4gZm9yDQo+IHYzLjE4
IGluc3RlYWQuDQpJIGRvbuKAmXQgdGhpbmsgaXRzIHVyZ2VudCBhcyBtb3N0IG9mIG91ciBjdXN0
b21lcnMgdXNlIExUU0kga2VybmVscywgZS5nLiB2My4xMC4NClJlbmVzYXMgdHlwaWNhbGx5IHBy
b3ZpZGUgb3V0LW9mLXRyZWUgQlNQcyB3aXRoIHVwc3RyZWFtIGNvZGUgYmFjayBwb3J0ZWQsIGFs
b25nDQp3aXRoIG90aGVyIHBhdGNoZXMuIFNpbW9uIEhvcm1hbiAoUmVuZXNhcyBtYWludGFpbmVy
LCBjYydkKSBnZW5lcmFsbHkgaGFuZGxlcw0KdGhlIGJhY2sgcG9ydHMsIHNvIEknbGwgZGVmZXIg
dG8gaGlzIG9waW5pb24uDQoNCj4gSWYgaXQgaXMgY3VycmVudGx5IGJyb2tlbiwgaXMgdGhlcmUg
YSBwb2ludCB3aGVyZSBpdCBicm9rZT8gIEkgYXNzdW1lDQo+IGl0IHVzZWQgdG8gd29yayBhdCBv
bmUgdGltZS4gIElmIHRoZXJlJ3MgYSBjb21taXQgdGhhdCBicm9rZSBpdCwgaXQNCj4gd291bGQg
YmUgbmljZSB0byByZWZlcmVuY2UgdGhhdCBpbiB0aGUgY2hhbmdlbG9nIGFuZCBleHBsYWluIGV4
YWN0bHkNCj4gd2hhdCB3YXMgYnJva2VuIGFuZCBob3cgdGhpcyBmaXhlcyBpdC4NCkJvdGggdGhl
IGludGVybmFsIFBDSSBhbmQgZXh0ZXJuYWwgUENJZSBkcml2ZXJzIHdvcmsgb24gdGhlaXIgb3du
LCBidXQgaGF2ZQ0KbmV2ZXIgd29ya2VkIGF0IHRoZSBzYW1lIHRpbWUuIEkgdGhpbmsgaXQgd2Fz
IGp1c3QgdW5mb3J0dW5hdGUgdGltaW5nIHdoZW4gSQ0KYWRkZWQgdGhlIFBDSWUgZHJpdmVyLiBB
dCB0aGF0IHRpbWUsIHRoZSBpbnRlcm5hbCBQQ0kgZHJpdmVyIGRpZG7igJl0IGhhdmUgdGhlDQpy
ZWxldmFudCBEVCBub2RlcyBmb3IgdGhlIGJvYXJkIEkgd2FzIHVzaW5nIHNvIEkgZGlkbid0IHNl
ZSBhbnkgY29uZmxpY3RzLg0KDQpUaGFua3MNClBoaWwNCg==
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-31 17:04 ` Phil Edworthy
@ 2014-11-03 23:26 ` Simon Horman
2014-11-04 11:44 ` Liviu Dudau
0 siblings, 1 reply; 32+ messages in thread
From: Simon Horman @ 2014-11-03 23:26 UTC (permalink / raw)
To: Phil Edworthy
Cc: Bjorn Helgaas, Lorenzo Pieralisi, linux-arm-kernel, linux-pci,
liviu.dudau, Arnd Bergmann, Jason Gunthorpe, Jingoo Han,
Russell King, Mohit Kumar
On Fri, Oct 31, 2014 at 05:04:49PM +0000, Phil Edworthy wrote:
> Hi Bjorn,
>
> On 31 October 2014 16:37, Bjorn wrote:
> > On Fri, Oct 31, 2014 at 7:43 AM, Phil Edworthy
> > <phil.edworthy@renesas.com> wrote:
> > > Hi Lorenzo,
> > >
> > > On 30 October 2014 11:45, Lorenzo wrote:
> > >> Most if not all ARM PCI host controller device drivers either ignore the
> > >> domain field in the pci_sys_data structure or just increment it every
> > >> time a host controller is probed, using it as a domain counter.
> > >>
> > >> Therefore, instead of relying on pci_sys_data to stash the domain number
> > >> in a standard location, ARM pcibios code can be moved to the newly
> > >> introduced generic PCI domains code, implemented in commits:
> > >>
> > >> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> > >> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
> > >>
> > >> commit 670ba0c8883b576d0aec28bd7a838358a4be1
> > >> ("PCI: Add generic domain handling")
> > >>
> > >> In order to assign a domain number dynamically, the ARM pcibios defines
> > >> the function, called by core PCI code:
> > >>
> > >> void pci_bus_assign_domain_nr(...)
> > >>
> > >> that relies on a DT property to define the domain number or falls back to
> > >> a counter; its usage replaces the current domain assignment code in PCI
> > >> host controllers present in the kernel.
> > >>
> > >> Cc: Arnd Bergmann <arnd@arndb.de>
> > >> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> > >> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > >> Cc: Jingoo Han <jg1.han@samsung.com>
> > >> Cc: Bjorn Helgaas <bhelgaas@google.com>
> > >> Cc: Russell King <linux@arm.linux.org.uk>
> > >> Cc: Mohit Kumar <mohit.kumar@st.com>
> > >> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > >
> > > This patch fixes a current problem with R-Car devices where there is an
> > > internal PCI bridge and an external PCIe bridge on the devices. Both drivers
> > > work independently but need to be on different domains. Just needed to
> > enable
> > > PCI_DOMAINS along with this.
> > > I've done basic testing that the internal PCI and external PCIe work at the
> > > same time.
> >
> > Hi Phil,
> >
> > Thanks for testing this. Can you give me some more guidance on where
> > you'd like to see this merged? Until your comment about this fixing a
> > current problem on R-Car, I probably would have considered this to be
> > a cleanup and enhancement and hence material for v3.19. But if R-Car
> > is actually broken and this fixes it, maybe this should go in for
> > v3.18 instead.
> I don’t think its urgent as most of our customers use LTSI kernels, e.g. v3.10.
> Renesas typically provide out-of-tree BSPs with upstream code back ported, along
> with other patches. Simon Horman (Renesas maintainer, cc'd) generally handles
> the back ports, so I'll defer to his opinion.
Hi Phil,
from my point of view it would be best if this went into -stable if it is a
fix. However, as you point out, from a customer point of view it shouldn't
be a big deal as they should get backports via our LTSI kernel regardless of
if the patch goes through stable or not.
> > If it is currently broken, is there a point where it broke? I assume
> > it used to work at one time. If there's a commit that broke it, it
> > would be nice to reference that in the changelog and explain exactly
> > what was broken and how this fixes it.
> Both the internal PCI and external PCIe drivers work on their own, but have
> never worked at the same time. I think it was just unfortunate timing when I
> added the PCIe driver. At that time, the internal PCI driver didn’t have the
> relevant DT nodes for the board I was using so I didn't see any conflicts.
>
> Thanks
> Phil
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-11-03 23:26 ` Simon Horman
@ 2014-11-04 11:44 ` Liviu Dudau
0 siblings, 0 replies; 32+ messages in thread
From: Liviu Dudau @ 2014-11-04 11:44 UTC (permalink / raw)
To: Simon Horman
Cc: Phil Edworthy, Bjorn Helgaas, Lorenzo Pieralisi,
linux-arm-kernel, linux-pci, Arnd Bergmann, Jason Gunthorpe,
Jingoo Han, Russell King, Mohit Kumar
On Mon, Nov 03, 2014 at 11:26:25PM +0000, Simon Horman wrote:
> On Fri, Oct 31, 2014 at 05:04:49PM +0000, Phil Edworthy wrote:
> > Hi Bjorn,
> >
> > On 31 October 2014 16:37, Bjorn wrote:
> > > On Fri, Oct 31, 2014 at 7:43 AM, Phil Edworthy
> > > <phil.edworthy@renesas.com> wrote:
> > > > Hi Lorenzo,
> > > >
> > > > On 30 October 2014 11:45, Lorenzo wrote:
> > > >> Most if not all ARM PCI host controller device drivers either ignore the
> > > >> domain field in the pci_sys_data structure or just increment it every
> > > >> time a host controller is probed, using it as a domain counter.
> > > >>
> > > >> Therefore, instead of relying on pci_sys_data to stash the domain number
> > > >> in a standard location, ARM pcibios code can be moved to the newly
> > > >> introduced generic PCI domains code, implemented in commits:
> > > >>
> > > >> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> > > >> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
> > > >>
> > > >> commit 670ba0c8883b576d0aec28bd7a838358a4be1
> > > >> ("PCI: Add generic domain handling")
> > > >>
> > > >> In order to assign a domain number dynamically, the ARM pcibios defines
> > > >> the function, called by core PCI code:
> > > >>
> > > >> void pci_bus_assign_domain_nr(...)
> > > >>
> > > >> that relies on a DT property to define the domain number or falls back to
> > > >> a counter; its usage replaces the current domain assignment code in PCI
> > > >> host controllers present in the kernel.
> > > >>
> > > >> Cc: Arnd Bergmann <arnd@arndb.de>
> > > >> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> > > >> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > > >> Cc: Jingoo Han <jg1.han@samsung.com>
> > > >> Cc: Bjorn Helgaas <bhelgaas@google.com>
> > > >> Cc: Russell King <linux@arm.linux.org.uk>
> > > >> Cc: Mohit Kumar <mohit.kumar@st.com>
> > > >> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > > >
> > > > This patch fixes a current problem with R-Car devices where there is an
> > > > internal PCI bridge and an external PCIe bridge on the devices. Both drivers
> > > > work independently but need to be on different domains. Just needed to
> > > enable
> > > > PCI_DOMAINS along with this.
> > > > I've done basic testing that the internal PCI and external PCIe work at the
> > > > same time.
> > >
> > > Hi Phil,
> > >
> > > Thanks for testing this. Can you give me some more guidance on where
> > > you'd like to see this merged? Until your comment about this fixing a
> > > current problem on R-Car, I probably would have considered this to be
> > > a cleanup and enhancement and hence material for v3.19. But if R-Car
> > > is actually broken and this fixes it, maybe this should go in for
> > > v3.18 instead.
> > I don’t think its urgent as most of our customers use LTSI kernels, e.g. v3.10.
> > Renesas typically provide out-of-tree BSPs with upstream code back ported, along
> > with other patches. Simon Horman (Renesas maintainer, cc'd) generally handles
> > the back ports, so I'll defer to his opinion.
>
> Hi Phil,
>
> from my point of view it would be best if this went into -stable if it is a
> fix. However, as you point out, from a customer point of view it shouldn't
> be a big deal as they should get backports via our LTSI kernel regardless of
> if the patch goes through stable or not.
Unfortunately this patch depends on a series that only got in in v3.18-rc1, so
I don't think -stable is a workable target.
Best regards,
Liviu
>
> > > If it is currently broken, is there a point where it broke? I assume
> > > it used to work at one time. If there's a commit that broke it, it
> > > would be nice to reference that in the changelog and explain exactly
> > > what was broken and how this fixes it.
> > Both the internal PCI and external PCIe drivers work on their own, but have
> > never worked at the same time. I think it was just unfortunate timing when I
> > added the PCIe driver. At that time, the internal PCI driver didn’t have the
> > relevant DT nodes for the board I was using so I didn't see any conflicts.
> >
> > Thanks
> > Phil
>
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-31 13:43 ` Phil Edworthy
2014-10-31 16:37 ` Bjorn Helgaas
@ 2014-11-03 11:06 ` Lorenzo Pieralisi
1 sibling, 0 replies; 32+ messages in thread
From: Lorenzo Pieralisi @ 2014-11-03 11:06 UTC (permalink / raw)
To: Phil Edworthy
Cc: linux-arm-kernel, linux-pci, Liviu Dudau, Arnd Bergmann,
Jason Gunthorpe, Jingoo Han, Bjorn Helgaas, Russell King,
Mohit Kumar, Simon Horman
Hi Phil,
On Fri, Oct 31, 2014 at 01:43:49PM +0000, Phil Edworthy wrote:
> Hi Lorenzo,
>
> On 30 October 2014 11:45, Lorenzo wrote:
> > Most if not all ARM PCI host controller device drivers either ignore the
> > domain field in the pci_sys_data structure or just increment it every
> > time a host controller is probed, using it as a domain counter.
> >
> > Therefore, instead of relying on pci_sys_data to stash the domain number
> > in a standard location, ARM pcibios code can be moved to the newly
> > introduced generic PCI domains code, implemented in commits:
> >
> > commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> > ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
> >
> > commit 670ba0c8883b576d0aec28bd7a838358a4be1
> > ("PCI: Add generic domain handling")
> >
> > In order to assign a domain number dynamically, the ARM pcibios defines
> > the function, called by core PCI code:
> >
> > void pci_bus_assign_domain_nr(...)
> >
> > that relies on a DT property to define the domain number or falls back to
> > a counter; its usage replaces the current domain assignment code in PCI
> > host controllers present in the kernel.
> >
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Phil Edworthy <phil.edworthy@renesas.com>
> > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > Cc: Jingoo Han <jg1.han@samsung.com>
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Cc: Mohit Kumar <mohit.kumar@st.com>
> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>
> This patch fixes a current problem with R-Car devices where there is an
> internal PCI bridge and an external PCIe bridge on the devices. Both drivers
> work independently but need to be on different domains. Just needed to enable
> PCI_DOMAINS along with this.
> I've done basic testing that the internal PCI and external PCIe work at the
> same time.
>
> Acked-by: Phil Edworthy <phil.edworthy@renesas.com>
Thank you very much.
Lorenzo
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-30 11:44 ` [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains Lorenzo Pieralisi
` (2 preceding siblings ...)
2014-10-31 13:43 ` Phil Edworthy
@ 2014-11-03 1:18 ` Jingoo Han
2014-11-03 2:36 ` Karicheri, Muralidharan
2014-11-03 11:23 ` Lorenzo Pieralisi
2014-11-03 3:48 ` Yijing Wang
4 siblings, 2 replies; 32+ messages in thread
From: Jingoo Han @ 2014-11-03 1:18 UTC (permalink / raw)
To: 'Lorenzo Pieralisi'
Cc: linux-arm-kernel, linux-pci, liviu.dudau, 'Arnd Bergmann',
'Phil Edworthy', 'Jason Gunthorpe',
'Bjorn Helgaas', 'Russell King',
'Mohit Kumar', 'Richard Zhu',
'Lucas Stach', 'Kishon Vijay Abraham I',
'Murali Karicheri', 'Jingoo Han'
On Thursday, October 30, 2014 8:45 PM, Lorenzo Pieralisi wrote:
>
> Most if not all ARM PCI host controller device drivers either ignore the
> domain field in the pci_sys_data structure or just increment it every
> time a host controller is probed, using it as a domain counter.
>
> Therefore, instead of relying on pci_sys_data to stash the domain number
> in a standard location, ARM pcibios code can be moved to the newly
> introduced generic PCI domains code, implemented in commits:
>
> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
>
> commit 670ba0c8883b576d0aec28bd7a838358a4be1
> ("PCI: Add generic domain handling")
>
> In order to assign a domain number dynamically, the ARM pcibios defines
> the function, called by core PCI code:
>
> void pci_bus_assign_domain_nr(...)
>
> that relies on a DT property to define the domain number or falls back to
> a counter; its usage replaces the current domain assignment code in PCI
> host controllers present in the kernel.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Jingoo Han <jg1.han@samsung.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Mohit Kumar <mohit.kumar@st.com>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
(+CC Richard Zhu, Lucas Stach, Kishon Vijay Abraham I, Murali Karicheri)
Acked-by: Jingoo Han <jg1.han@samsung.com>
For a long time, I have wanted the patch like this. Personally,
I want to increase the build coverage and keep the same binary
regardless of config options as possible; thus, I don't like
#ifdef guards such as '#ifdef CONFIG_PCI_DOMAINS'. When I submitted
the first patch for 'pcie-designware.c', I was not able to find
a way to remove '#ifdef CONFIG_PCI_DOMAINS' from 'pcie-designware.c'.
This patch looks good and I think that this patch will not make
the problem. However, I didn't test this patch with Exynos platform,
due to some reasons. So, I hope that other engineers test this patch
on other SoC platforms related to designware PCIe.
To Mohit Kumar (ST SPEAR13XX), Richard Zhu/Lucas Stach (IMX6)
Kishon Vijay Abraham I (TI DRA7XX), Murali Karicheri (TI KEYSTONE)
Would you test this patch and share the result?
It would be very helpful. Thank you.
Best regards,
Jingoo Han
> ---
> arch/arm/Kconfig | 3 +++
> arch/arm/include/asm/mach/pci.h | 3 ---
> arch/arm/include/asm/pci.h | 7 -------
> arch/arm/kernel/bios32.c | 26 +++++++++++++++++++++++---
> drivers/pci/host/pci-mvebu.c | 10 ++--------
> drivers/pci/host/pcie-designware.c | 3 ---
> drivers/pci/host/pcie-rcar.c | 3 ---
> 7 files changed, 28 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 89c4b5c..29544f0 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1292,6 +1292,9 @@ config PCI_DOMAINS
> bool
> depends on PCI
>
> +config PCI_DOMAINS_GENERIC
> + def_bool PCI_DOMAINS
> +
> config PCI_NANOENGINE
> bool "BSE nanoEngine PCI support"
> depends on SA1100_NANOENGINE
> diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
> index 7fc4278..f19f627 100644
> --- a/arch/arm/include/asm/mach/pci.h
> +++ b/arch/arm/include/asm/mach/pci.h
> @@ -44,9 +44,6 @@ struct hw_pci {
> * Per-controller structure
> */
> struct pci_sys_data {
> -#ifdef CONFIG_PCI_DOMAINS
> - int domain;
> -#endif
> struct list_head node;
> int busnr; /* primary bus number */
> u64 mem_offset; /* bus->cpu memory mapping offset */
> diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
> index 7e95d85..585dc33 100644
> --- a/arch/arm/include/asm/pci.h
> +++ b/arch/arm/include/asm/pci.h
> @@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void)
> }
>
> #ifdef CONFIG_PCI_DOMAINS
> -static inline int pci_domain_nr(struct pci_bus *bus)
> -{
> - struct pci_sys_data *root = bus->sysdata;
> -
> - return root->domain;
> -}
> -
> static inline int pci_proc_domain(struct pci_bus *bus)
> {
> return pci_domain_nr(bus);
> diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
> index 17a26c1..d8c2b4e 100644
> --- a/arch/arm/kernel/bios32.c
> +++ b/arch/arm/kernel/bios32.c
> @@ -11,6 +11,8 @@
> #include <linux/slab.h>
> #include <linux/init.h>
> #include <linux/io.h>
> +#include <linux/of.h>
> +#include <linux/of_pci.h>
>
> #include <asm/mach-types.h>
> #include <asm/mach/map.h>
> @@ -468,9 +470,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> if (!sys)
> panic("PCI: unable to allocate sys data!");
>
> -#ifdef CONFIG_PCI_DOMAINS
> - sys->domain = hw->domain;
> -#endif
> sys->busnr = busnr;
> sys->swizzle = hw->swizzle;
> sys->map_irq = hw->map_irq;
> @@ -511,6 +510,27 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> }
> }
>
> +#ifdef CONFIG_PCI_DOMAINS_GENERIC
> +static bool dt_domain_found;
> +
> +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
> +{
> + int domain = of_get_pci_domain_nr(parent->of_node);
> +
> + if (domain >= 0) {
> + dt_domain_found = true;
> + } else if (dt_domain_found == true) {
> + dev_err(parent, "Node %s is missing \"linux,pci-domain\" property in DT\n",
> + parent->of_node->full_name);
> + return;
> + } else {
> + domain = pci_get_new_domain_nr();
> + }
> +
> + bus->domain_nr = domain;
> +}
> +#endif
> +
> void pci_common_init_dev(struct device *parent, struct hw_pci *hw)
> {
> struct pci_sys_data *sys;
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index b1315e1..2b4c1f2 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -722,17 +722,11 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
> {
> struct mvebu_pcie *pcie = sys_to_pcie(sys);
> int i;
> - int domain = 0;
>
> -#ifdef CONFIG_PCI_DOMAINS
> - domain = sys->domain;
> -#endif
> -
> - snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
> - domain);
> + snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x", nr);
> pcie->mem.name = pcie->mem_name;
>
> - snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", domain);
> + snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", nr);
> pcie->realio.name = pcie->io_name;
>
> if (request_resource(&iomem_resource, &pcie->mem))
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> index dfed00a..6790b87 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -502,9 +502,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
> dw_pci.private_data = (void **)&pp;
>
> pci_common_init_dev(pp->dev, &dw_pci);
> -#ifdef CONFIG_PCI_DOMAINS
> - dw_pci.domain++;
> -#endif
>
> return 0;
> }
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 61158e0..b6b859e 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -404,9 +404,6 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie)
> rcar_pci.private_data = (void **)&pcie;
>
> pci_common_init_dev(&pdev->dev, &rcar_pci);
> -#ifdef CONFIG_PCI_DOMAINS
> - rcar_pci.domain++;
> -#endif
> }
>
> static int phy_wait_for_ack(struct rcar_pcie *pcie)
> --
> 2.1.2
^ permalink raw reply [flat|nested] 32+ messages in thread* RE: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-11-03 1:18 ` Jingoo Han
@ 2014-11-03 2:36 ` Karicheri, Muralidharan
2014-11-03 11:23 ` Lorenzo Pieralisi
1 sibling, 0 replies; 32+ messages in thread
From: Karicheri, Muralidharan @ 2014-11-03 2:36 UTC (permalink / raw)
To: Jingoo Han, 'Lorenzo Pieralisi'
Cc: linux-arm-kernel, linux-pci, liviu.dudau, 'Arnd Bergmann',
'Phil Edworthy', 'Jason Gunthorpe',
'Bjorn Helgaas', 'Russell King',
'Mohit Kumar', 'Richard Zhu',
'Lucas Stach',
KISHON VIJAY ABRAHAM
>-----Original Message-----
>From: Jingoo Han [mailto:jg1.han@samsung.com]
>Sent: Sunday, November 02, 2014 8:18 PM
>To: 'Lorenzo Pieralisi'
>Cc: linux-arm-kernel@lists.infradead.org; linux-pci@vger.kernel.org; liviu.dudau@arm.com;
>'Arnd Bergmann'; 'Phil Edworthy'; 'Jason Gunthorpe'; 'Bjorn Helgaas'; 'Russell King'; 'Mohit
>Kumar'; 'Richard Zhu'; 'Lucas Stach'; KISHON VIJAY ABRAHAM; Karicheri, Muralidharan;
>'Jingoo Han'
>Subject: Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
>
>On Thursday, October 30, 2014 8:45 PM, Lorenzo Pieralisi wrote:
>>
>> Most if not all ARM PCI host controller device drivers either ignore
>> the domain field in the pci_sys_data structure or just increment it
>> every time a host controller is probed, using it as a domain counter.
>>
>> Therefore, instead of relying on pci_sys_data to stash the domain
>> number in a standard location, ARM pcibios code can be moved to the
>> newly introduced generic PCI domains code, implemented in commits:
>>
>> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
>> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
>>
>> commit 670ba0c8883b576d0aec28bd7a838358a4be1
>> ("PCI: Add generic domain handling")
>>
>> In order to assign a domain number dynamically, the ARM pcibios
>> defines the function, called by core PCI code:
>>
>> void pci_bus_assign_domain_nr(...)
>>
>> that relies on a DT property to define the domain number or falls back
>> to a counter; its usage replaces the current domain assignment code in
>> PCI host controllers present in the kernel.
>>
>> Cc: Arnd Bergmann <arnd@arndb.de>
>> Cc: Phil Edworthy <phil.edworthy@renesas.com>
>> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
>> Cc: Jingoo Han <jg1.han@samsung.com>
>> Cc: Bjorn Helgaas <bhelgaas@google.com>
>> Cc: Russell King <linux@arm.linux.org.uk>
>> Cc: Mohit Kumar <mohit.kumar@st.com>
>> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>
>(+CC Richard Zhu, Lucas Stach, Kishon Vijay Abraham I, Murali Karicheri)
>
>Acked-by: Jingoo Han <jg1.han@samsung.com>
>
>For a long time, I have wanted the patch like this. Personally, I want to increase the build
>coverage and keep the same binary regardless of config options as possible; thus, I don't
>like #ifdef guards such as '#ifdef CONFIG_PCI_DOMAINS'. When I submitted the first patch
>for 'pcie-designware.c', I was not able to find a way to remove '#ifdef
>CONFIG_PCI_DOMAINS' from 'pcie-designware.c'.
>
>This patch looks good and I think that this patch will not make the problem. However, I
>didn't test this patch with Exynos platform, due to some reasons. So, I hope that other
>engineers test this patch on other SoC platforms related to designware PCIe.
>
>To Mohit Kumar (ST SPEAR13XX), Richard Zhu/Lucas Stach (IMX6)
> Kishon Vijay Abraham I (TI DRA7XX), Murali Karicheri (TI KEYSTONE)
>
Jingoo,
I will be able to try this sometime after 11/9 as I am on travel.
Regards,
Murali
>Would you test this patch and share the result?
>It would be very helpful. Thank you.
>
>Best regards,
>Jingoo Han
>
>> ---
>> arch/arm/Kconfig | 3 +++
>> arch/arm/include/asm/mach/pci.h | 3 ---
>> arch/arm/include/asm/pci.h | 7 -------
>> arch/arm/kernel/bios32.c | 26 +++++++++++++++++++++++---
>> drivers/pci/host/pci-mvebu.c | 10 ++--------
>> drivers/pci/host/pcie-designware.c | 3 ---
>> drivers/pci/host/pcie-rcar.c | 3 ---
>> 7 files changed, 28 insertions(+), 27 deletions(-)
>>
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index
>> 89c4b5c..29544f0 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -1292,6 +1292,9 @@ config PCI_DOMAINS
>> bool
>> depends on PCI
>>
>> +config PCI_DOMAINS_GENERIC
>> + def_bool PCI_DOMAINS
>> +
>> config PCI_NANOENGINE
>> bool "BSE nanoEngine PCI support"
>> depends on SA1100_NANOENGINE
>> diff --git a/arch/arm/include/asm/mach/pci.h
>> b/arch/arm/include/asm/mach/pci.h index 7fc4278..f19f627 100644
>> --- a/arch/arm/include/asm/mach/pci.h
>> +++ b/arch/arm/include/asm/mach/pci.h
>> @@ -44,9 +44,6 @@ struct hw_pci {
>> * Per-controller structure
>> */
>> struct pci_sys_data {
>> -#ifdef CONFIG_PCI_DOMAINS
>> - int domain;
>> -#endif
>> struct list_head node;
>> int busnr; /* primary bus number */
>> u64 mem_offset; /* bus->cpu memory mapping offset */
>> diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
>> index 7e95d85..585dc33 100644
>> --- a/arch/arm/include/asm/pci.h
>> +++ b/arch/arm/include/asm/pci.h
>> @@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void)
>> }
>>
>> #ifdef CONFIG_PCI_DOMAINS
>> -static inline int pci_domain_nr(struct pci_bus *bus) -{
>> - struct pci_sys_data *root = bus->sysdata;
>> -
>> - return root->domain;
>> -}
>> -
>> static inline int pci_proc_domain(struct pci_bus *bus) {
>> return pci_domain_nr(bus);
>> diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index
>> 17a26c1..d8c2b4e 100644
>> --- a/arch/arm/kernel/bios32.c
>> +++ b/arch/arm/kernel/bios32.c
>> @@ -11,6 +11,8 @@
>> #include <linux/slab.h>
>> #include <linux/init.h>
>> #include <linux/io.h>
>> +#include <linux/of.h>
>> +#include <linux/of_pci.h>
>>
>> #include <asm/mach-types.h>
>> #include <asm/mach/map.h>
>> @@ -468,9 +470,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci
>*hw,
>> if (!sys)
>> panic("PCI: unable to allocate sys data!");
>>
>> -#ifdef CONFIG_PCI_DOMAINS
>> - sys->domain = hw->domain;
>> -#endif
>> sys->busnr = busnr;
>> sys->swizzle = hw->swizzle;
>> sys->map_irq = hw->map_irq;
>> @@ -511,6 +510,27 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci
>*hw,
>> }
>> }
>>
>> +#ifdef CONFIG_PCI_DOMAINS_GENERIC
>> +static bool dt_domain_found;
>> +
>> +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device
>> +*parent) {
>> + int domain = of_get_pci_domain_nr(parent->of_node);
>> +
>> + if (domain >= 0) {
>> + dt_domain_found = true;
>> + } else if (dt_domain_found == true) {
>> + dev_err(parent, "Node %s is missing \"linux,pci-domain\" property in DT\n",
>> + parent->of_node->full_name);
>> + return;
>> + } else {
>> + domain = pci_get_new_domain_nr();
>> + }
>> +
>> + bus->domain_nr = domain;
>> +}
>> +#endif
>> +
>> void pci_common_init_dev(struct device *parent, struct hw_pci *hw) {
>> struct pci_sys_data *sys;
>> diff --git a/drivers/pci/host/pci-mvebu.c
>> b/drivers/pci/host/pci-mvebu.c index b1315e1..2b4c1f2 100644
>> --- a/drivers/pci/host/pci-mvebu.c
>> +++ b/drivers/pci/host/pci-mvebu.c
>> @@ -722,17 +722,11 @@ static int mvebu_pcie_setup(int nr, struct
>> pci_sys_data *sys) {
>> struct mvebu_pcie *pcie = sys_to_pcie(sys);
>> int i;
>> - int domain = 0;
>>
>> -#ifdef CONFIG_PCI_DOMAINS
>> - domain = sys->domain;
>> -#endif
>> -
>> - snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
>> - domain);
>> + snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
>> +nr);
>> pcie->mem.name = pcie->mem_name;
>>
>> - snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", domain);
>> + snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", nr);
>> pcie->realio.name = pcie->io_name;
>>
>> if (request_resource(&iomem_resource, &pcie->mem)) diff --git
>> a/drivers/pci/host/pcie-designware.c
>> b/drivers/pci/host/pcie-designware.c
>> index dfed00a..6790b87 100644
>> --- a/drivers/pci/host/pcie-designware.c
>> +++ b/drivers/pci/host/pcie-designware.c
>> @@ -502,9 +502,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
>> dw_pci.private_data = (void **)&pp;
>>
>> pci_common_init_dev(pp->dev, &dw_pci); -#ifdef CONFIG_PCI_DOMAINS
>> - dw_pci.domain++;
>> -#endif
>>
>> return 0;
>> }
>> diff --git a/drivers/pci/host/pcie-rcar.c
>> b/drivers/pci/host/pcie-rcar.c index 61158e0..b6b859e 100644
>> --- a/drivers/pci/host/pcie-rcar.c
>> +++ b/drivers/pci/host/pcie-rcar.c
>> @@ -404,9 +404,6 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie)
>> rcar_pci.private_data = (void **)&pcie;
>>
>> pci_common_init_dev(&pdev->dev, &rcar_pci); -#ifdef
>> CONFIG_PCI_DOMAINS
>> - rcar_pci.domain++;
>> -#endif
>> }
>>
>> static int phy_wait_for_ack(struct rcar_pcie *pcie)
>> --
>> 2.1.2
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-11-03 1:18 ` Jingoo Han
2014-11-03 2:36 ` Karicheri, Muralidharan
@ 2014-11-03 11:23 ` Lorenzo Pieralisi
2014-11-03 11:33 ` Lucas Stach
1 sibling, 1 reply; 32+ messages in thread
From: Lorenzo Pieralisi @ 2014-11-03 11:23 UTC (permalink / raw)
To: Jingoo Han
Cc: linux-arm-kernel, linux-pci, Liviu Dudau, 'Arnd Bergmann',
'Phil Edworthy', 'Jason Gunthorpe',
'Bjorn Helgaas', 'Russell King',
'Mohit Kumar', 'Richard Zhu',
'Lucas Stach', 'Kishon Vijay Abraham I',
'Murali Karicheri'
On Mon, Nov 03, 2014 at 01:18:12AM +0000, Jingoo Han wrote:
> On Thursday, October 30, 2014 8:45 PM, Lorenzo Pieralisi wrote:
> >
> > Most if not all ARM PCI host controller device drivers either ignore the
> > domain field in the pci_sys_data structure or just increment it every
> > time a host controller is probed, using it as a domain counter.
> >
> > Therefore, instead of relying on pci_sys_data to stash the domain number
> > in a standard location, ARM pcibios code can be moved to the newly
> > introduced generic PCI domains code, implemented in commits:
> >
> > commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> > ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
> >
> > commit 670ba0c8883b576d0aec28bd7a838358a4be1
> > ("PCI: Add generic domain handling")
> >
> > In order to assign a domain number dynamically, the ARM pcibios defines
> > the function, called by core PCI code:
> >
> > void pci_bus_assign_domain_nr(...)
> >
> > that relies on a DT property to define the domain number or falls back to
> > a counter; its usage replaces the current domain assignment code in PCI
> > host controllers present in the kernel.
> >
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Cc: Phil Edworthy <phil.edworthy@renesas.com>
> > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > Cc: Jingoo Han <jg1.han@samsung.com>
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Cc: Mohit Kumar <mohit.kumar@st.com>
> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>
> (+CC Richard Zhu, Lucas Stach, Kishon Vijay Abraham I, Murali Karicheri)
>
> Acked-by: Jingoo Han <jg1.han@samsung.com>
Thank you Jingoo.
> For a long time, I have wanted the patch like this. Personally,
> I want to increase the build coverage and keep the same binary
> regardless of config options as possible; thus, I don't like
> #ifdef guards such as '#ifdef CONFIG_PCI_DOMAINS'. When I submitted
> the first patch for 'pcie-designware.c', I was not able to find
> a way to remove '#ifdef CONFIG_PCI_DOMAINS' from 'pcie-designware.c'.
>
> This patch looks good and I think that this patch will not make
> the problem. However, I didn't test this patch with Exynos platform,
> due to some reasons. So, I hope that other engineers test this patch
> on other SoC platforms related to designware PCIe.
>
> To Mohit Kumar (ST SPEAR13XX), Richard Zhu/Lucas Stach (IMX6)
> Kishon Vijay Abraham I (TI DRA7XX), Murali Karicheri (TI KEYSTONE)
>
> Would you test this patch and share the result?
> It would be very helpful. Thank you.
I am happy to wait for a week or two before asking to add this code to -next,
it would be definitely great to get more coverage on pcie-designware.
Thanks,
Lorenzo
> Best regards,
> Jingoo Han
>
> > ---
> > arch/arm/Kconfig | 3 +++
> > arch/arm/include/asm/mach/pci.h | 3 ---
> > arch/arm/include/asm/pci.h | 7 -------
> > arch/arm/kernel/bios32.c | 26 +++++++++++++++++++++++---
> > drivers/pci/host/pci-mvebu.c | 10 ++--------
> > drivers/pci/host/pcie-designware.c | 3 ---
> > drivers/pci/host/pcie-rcar.c | 3 ---
> > 7 files changed, 28 insertions(+), 27 deletions(-)
> >
> > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> > index 89c4b5c..29544f0 100644
> > --- a/arch/arm/Kconfig
> > +++ b/arch/arm/Kconfig
> > @@ -1292,6 +1292,9 @@ config PCI_DOMAINS
> > bool
> > depends on PCI
> >
> > +config PCI_DOMAINS_GENERIC
> > + def_bool PCI_DOMAINS
> > +
> > config PCI_NANOENGINE
> > bool "BSE nanoEngine PCI support"
> > depends on SA1100_NANOENGINE
> > diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
> > index 7fc4278..f19f627 100644
> > --- a/arch/arm/include/asm/mach/pci.h
> > +++ b/arch/arm/include/asm/mach/pci.h
> > @@ -44,9 +44,6 @@ struct hw_pci {
> > * Per-controller structure
> > */
> > struct pci_sys_data {
> > -#ifdef CONFIG_PCI_DOMAINS
> > - int domain;
> > -#endif
> > struct list_head node;
> > int busnr; /* primary bus number */
> > u64 mem_offset; /* bus->cpu memory mapping offset */
> > diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
> > index 7e95d85..585dc33 100644
> > --- a/arch/arm/include/asm/pci.h
> > +++ b/arch/arm/include/asm/pci.h
> > @@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void)
> > }
> >
> > #ifdef CONFIG_PCI_DOMAINS
> > -static inline int pci_domain_nr(struct pci_bus *bus)
> > -{
> > - struct pci_sys_data *root = bus->sysdata;
> > -
> > - return root->domain;
> > -}
> > -
> > static inline int pci_proc_domain(struct pci_bus *bus)
> > {
> > return pci_domain_nr(bus);
> > diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
> > index 17a26c1..d8c2b4e 100644
> > --- a/arch/arm/kernel/bios32.c
> > +++ b/arch/arm/kernel/bios32.c
> > @@ -11,6 +11,8 @@
> > #include <linux/slab.h>
> > #include <linux/init.h>
> > #include <linux/io.h>
> > +#include <linux/of.h>
> > +#include <linux/of_pci.h>
> >
> > #include <asm/mach-types.h>
> > #include <asm/mach/map.h>
> > @@ -468,9 +470,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> > if (!sys)
> > panic("PCI: unable to allocate sys data!");
> >
> > -#ifdef CONFIG_PCI_DOMAINS
> > - sys->domain = hw->domain;
> > -#endif
> > sys->busnr = busnr;
> > sys->swizzle = hw->swizzle;
> > sys->map_irq = hw->map_irq;
> > @@ -511,6 +510,27 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> > }
> > }
> >
> > +#ifdef CONFIG_PCI_DOMAINS_GENERIC
> > +static bool dt_domain_found;
> > +
> > +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
> > +{
> > + int domain = of_get_pci_domain_nr(parent->of_node);
> > +
> > + if (domain >= 0) {
> > + dt_domain_found = true;
> > + } else if (dt_domain_found == true) {
> > + dev_err(parent, "Node %s is missing \"linux,pci-domain\" property in DT\n",
> > + parent->of_node->full_name);
> > + return;
> > + } else {
> > + domain = pci_get_new_domain_nr();
> > + }
> > +
> > + bus->domain_nr = domain;
> > +}
> > +#endif
> > +
> > void pci_common_init_dev(struct device *parent, struct hw_pci *hw)
> > {
> > struct pci_sys_data *sys;
> > diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> > index b1315e1..2b4c1f2 100644
> > --- a/drivers/pci/host/pci-mvebu.c
> > +++ b/drivers/pci/host/pci-mvebu.c
> > @@ -722,17 +722,11 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
> > {
> > struct mvebu_pcie *pcie = sys_to_pcie(sys);
> > int i;
> > - int domain = 0;
> >
> > -#ifdef CONFIG_PCI_DOMAINS
> > - domain = sys->domain;
> > -#endif
> > -
> > - snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
> > - domain);
> > + snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x", nr);
> > pcie->mem.name = pcie->mem_name;
> >
> > - snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", domain);
> > + snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", nr);
> > pcie->realio.name = pcie->io_name;
> >
> > if (request_resource(&iomem_resource, &pcie->mem))
> > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> > index dfed00a..6790b87 100644
> > --- a/drivers/pci/host/pcie-designware.c
> > +++ b/drivers/pci/host/pcie-designware.c
> > @@ -502,9 +502,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
> > dw_pci.private_data = (void **)&pp;
> >
> > pci_common_init_dev(pp->dev, &dw_pci);
> > -#ifdef CONFIG_PCI_DOMAINS
> > - dw_pci.domain++;
> > -#endif
> >
> > return 0;
> > }
> > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> > index 61158e0..b6b859e 100644
> > --- a/drivers/pci/host/pcie-rcar.c
> > +++ b/drivers/pci/host/pcie-rcar.c
> > @@ -404,9 +404,6 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie)
> > rcar_pci.private_data = (void **)&pcie;
> >
> > pci_common_init_dev(&pdev->dev, &rcar_pci);
> > -#ifdef CONFIG_PCI_DOMAINS
> > - rcar_pci.domain++;
> > -#endif
> > }
> >
> > static int phy_wait_for_ack(struct rcar_pcie *pcie)
> > --
> > 2.1.2
>
> --
> 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
>
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-11-03 11:23 ` Lorenzo Pieralisi
@ 2014-11-03 11:33 ` Lucas Stach
2014-11-03 12:13 ` Jingoo Han
0 siblings, 1 reply; 32+ messages in thread
From: Lucas Stach @ 2014-11-03 11:33 UTC (permalink / raw)
To: Lorenzo Pieralisi
Cc: Jingoo Han, linux-arm-kernel, linux-pci, Liviu Dudau,
'Arnd Bergmann', 'Phil Edworthy',
'Jason Gunthorpe', 'Bjorn Helgaas',
'Russell King', 'Mohit Kumar',
'Richard Zhu', 'Kishon Vijay Abraham I',
'Murali Karicheri'
Am Montag, den 03.11.2014, 11:23 +0000 schrieb Lorenzo Pieralisi:
> On Mon, Nov 03, 2014 at 01:18:12AM +0000, Jingoo Han wrote:
> > On Thursday, October 30, 2014 8:45 PM, Lorenzo Pieralisi wrote:
> > >
> > > Most if not all ARM PCI host controller device drivers either ignore the
> > > domain field in the pci_sys_data structure or just increment it every
> > > time a host controller is probed, using it as a domain counter.
> > >
> > > Therefore, instead of relying on pci_sys_data to stash the domain number
> > > in a standard location, ARM pcibios code can be moved to the newly
> > > introduced generic PCI domains code, implemented in commits:
> > >
> > > commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> > > ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
> > >
> > > commit 670ba0c8883b576d0aec28bd7a838358a4be1
> > > ("PCI: Add generic domain handling")
> > >
> > > In order to assign a domain number dynamically, the ARM pcibios defines
> > > the function, called by core PCI code:
> > >
> > > void pci_bus_assign_domain_nr(...)
> > >
> > > that relies on a DT property to define the domain number or falls back to
> > > a counter; its usage replaces the current domain assignment code in PCI
> > > host controllers present in the kernel.
> > >
> > > Cc: Arnd Bergmann <arnd@arndb.de>
> > > Cc: Phil Edworthy <phil.edworthy@renesas.com>
> > > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > > Cc: Jingoo Han <jg1.han@samsung.com>
> > > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > > Cc: Russell King <linux@arm.linux.org.uk>
> > > Cc: Mohit Kumar <mohit.kumar@st.com>
> > > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> >
> > (+CC Richard Zhu, Lucas Stach, Kishon Vijay Abraham I, Murali Karicheri)
> >
> > Acked-by: Jingoo Han <jg1.han@samsung.com>
>
> Thank you Jingoo.
>
> > For a long time, I have wanted the patch like this. Personally,
> > I want to increase the build coverage and keep the same binary
> > regardless of config options as possible; thus, I don't like
> > #ifdef guards such as '#ifdef CONFIG_PCI_DOMAINS'. When I submitted
> > the first patch for 'pcie-designware.c', I was not able to find
> > a way to remove '#ifdef CONFIG_PCI_DOMAINS' from 'pcie-designware.c'.
> >
> > This patch looks good and I think that this patch will not make
> > the problem. However, I didn't test this patch with Exynos platform,
> > due to some reasons. So, I hope that other engineers test this patch
> > on other SoC platforms related to designware PCIe.
> >
> > To Mohit Kumar (ST SPEAR13XX), Richard Zhu/Lucas Stach (IMX6)
> > Kishon Vijay Abraham I (TI DRA7XX), Murali Karicheri (TI KEYSTONE)
> >
> > Would you test this patch and share the result?
> > It would be very helpful. Thank you.
>
> I am happy to wait for a week or two before asking to add this code to -next,
> it would be definitely great to get more coverage on pcie-designware.
>
I've just tested this on i.MX6 on top of 3.18-rc3. Given that we only
use a single domain there this patch should obviously not break
anything. Testing backs this claim, so:
Tested-by: Lucas Stach <l.stach@pengutronix.de>
I also looked through the patch briefly and it seems sane to me, so this
is also:
Acked-by: Lucas Stach <l.stach@pengutronix.de>
I don't like the fact that a proper binding documentation is missing for
the "linux,pci-domain" property, but this isn't the fault of this
patchset.
Regards,
Lucas
--
Pengutronix e.K. | Lucas Stach |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-11-03 11:33 ` Lucas Stach
@ 2014-11-03 12:13 ` Jingoo Han
0 siblings, 0 replies; 32+ messages in thread
From: Jingoo Han @ 2014-11-03 12:13 UTC (permalink / raw)
To: 'Lucas Stach', 'Lorenzo Pieralisi'
Cc: linux-arm-kernel, linux-pci, 'Liviu Dudau',
'Arnd Bergmann', 'Phil Edworthy',
'Jason Gunthorpe', 'Bjorn Helgaas',
'Russell King', 'Mohit Kumar',
'Richard Zhu', 'Kishon Vijay Abraham I',
'Murali Karicheri', 'Jingoo Han'
On Monday, November 03, 2014 8:34 PM, Lucas Stach wrote:
> Am Montag, den 03.11.2014, 11:23 +0000 schrieb Lorenzo Pieralisi:
> > On Mon, Nov 03, 2014 at 01:18:12AM +0000, Jingoo Han wrote:
> > > On Thursday, October 30, 2014 8:45 PM, Lorenzo Pieralisi wrote:
> > > >
> > > > Most if not all ARM PCI host controller device drivers either ignore the
> > > > domain field in the pci_sys_data structure or just increment it every
> > > > time a host controller is probed, using it as a domain counter.
> > > >
> > > > Therefore, instead of relying on pci_sys_data to stash the domain number
> > > > in a standard location, ARM pcibios code can be moved to the newly
> > > > introduced generic PCI domains code, implemented in commits:
> > > >
> > > > commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> > > > ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
> > > >
> > > > commit 670ba0c8883b576d0aec28bd7a838358a4be1
> > > > ("PCI: Add generic domain handling")
> > > >
> > > > In order to assign a domain number dynamically, the ARM pcibios defines
> > > > the function, called by core PCI code:
> > > >
> > > > void pci_bus_assign_domain_nr(...)
> > > >
> > > > that relies on a DT property to define the domain number or falls back to
> > > > a counter; its usage replaces the current domain assignment code in PCI
> > > > host controllers present in the kernel.
> > > >
> > > > Cc: Arnd Bergmann <arnd@arndb.de>
> > > > Cc: Phil Edworthy <phil.edworthy@renesas.com>
> > > > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > > > Cc: Jingoo Han <jg1.han@samsung.com>
> > > > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > > > Cc: Russell King <linux@arm.linux.org.uk>
> > > > Cc: Mohit Kumar <mohit.kumar@st.com>
> > > > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > >
> > > (+CC Richard Zhu, Lucas Stach, Kishon Vijay Abraham I, Murali Karicheri)
> > >
> > > Acked-by: Jingoo Han <jg1.han@samsung.com>
> >
> > Thank you Jingoo.
> >
> > > For a long time, I have wanted the patch like this. Personally,
> > > I want to increase the build coverage and keep the same binary
> > > regardless of config options as possible; thus, I don't like
> > > #ifdef guards such as '#ifdef CONFIG_PCI_DOMAINS'. When I submitted
> > > the first patch for 'pcie-designware.c', I was not able to find
> > > a way to remove '#ifdef CONFIG_PCI_DOMAINS' from 'pcie-designware.c'.
> > >
> > > This patch looks good and I think that this patch will not make
> > > the problem. However, I didn't test this patch with Exynos platform,
> > > due to some reasons. So, I hope that other engineers test this patch
> > > on other SoC platforms related to designware PCIe.
> > >
> > > To Mohit Kumar (ST SPEAR13XX), Richard Zhu/Lucas Stach (IMX6)
> > > Kishon Vijay Abraham I (TI DRA7XX), Murali Karicheri (TI KEYSTONE)
> > >
> > > Would you test this patch and share the result?
> > > It would be very helpful. Thank you.
> >
> > I am happy to wait for a week or two before asking to add this code to -next,
> > it would be definitely great to get more coverage on pcie-designware.
> >
> I've just tested this on i.MX6 on top of 3.18-rc3. Given that we only
> use a single domain there this patch should obviously not break
> anything. Testing backs this claim, so:
>
> Tested-by: Lucas Stach <l.stach@pengutronix.de>
Thank you for your testing!
In fact, Exynos uses multi domain structures.
>
> I also looked through the patch briefly and it seems sane to me, so this
> is also:
>
> Acked-by: Lucas Stach <l.stach@pengutronix.de>
>
> I don't like the fact that a proper binding documentation is missing for
> the "linux,pci-domain" property, but this isn't the fault of this
> patchset.
I agree with your opinion. I also thought that the binding documentation
for the "linux,pci-domain" property is needed.
>
> Regards,
> Lucas
>
> --
> Pengutronix e.K. | Lucas Stach |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-10-30 11:44 ` [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains Lorenzo Pieralisi
` (3 preceding siblings ...)
2014-11-03 1:18 ` Jingoo Han
@ 2014-11-03 3:48 ` Yijing Wang
2014-11-03 10:49 ` Lorenzo Pieralisi
4 siblings, 1 reply; 32+ messages in thread
From: Yijing Wang @ 2014-11-03 3:48 UTC (permalink / raw)
To: Lorenzo Pieralisi, linux-arm-kernel, linux-pci
Cc: liviu.dudau, Arnd Bergmann, Phil Edworthy, Jason Gunthorpe,
Jingoo Han, Bjorn Helgaas, Russell King, Mohit Kumar
On 2014/10/30 19:44, Lorenzo Pieralisi wrote:
> Most if not all ARM PCI host controller device drivers either ignore the
> domain field in the pci_sys_data structure or just increment it every
> time a host controller is probed, using it as a domain counter.
>
> Therefore, instead of relying on pci_sys_data to stash the domain number
> in a standard location, ARM pcibios code can be moved to the newly
> introduced generic PCI domains code, implemented in commits:
>
> commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9
> ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()")
>
> commit 670ba0c8883b576d0aec28bd7a838358a4be1
> ("PCI: Add generic domain handling")
>
> In order to assign a domain number dynamically, the ARM pcibios defines
> the function, called by core PCI code:
>
> void pci_bus_assign_domain_nr(...)
>
> that relies on a DT property to define the domain number or falls back to
> a counter; its usage replaces the current domain assignment code in PCI
> host controllers present in the kernel.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Jingoo Han <jg1.han@samsung.com>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Mohit Kumar <mohit.kumar@st.com>
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> ---
> arch/arm/Kconfig | 3 +++
> arch/arm/include/asm/mach/pci.h | 3 ---
> arch/arm/include/asm/pci.h | 7 -------
> arch/arm/kernel/bios32.c | 26 +++++++++++++++++++++++---
> drivers/pci/host/pci-mvebu.c | 10 ++--------
> drivers/pci/host/pcie-designware.c | 3 ---
> drivers/pci/host/pcie-rcar.c | 3 ---
> 7 files changed, 28 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 89c4b5c..29544f0 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1292,6 +1292,9 @@ config PCI_DOMAINS
> bool
> depends on PCI
>
> +config PCI_DOMAINS_GENERIC
> + def_bool PCI_DOMAINS
> +
> config PCI_NANOENGINE
> bool "BSE nanoEngine PCI support"
> depends on SA1100_NANOENGINE
> diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
> index 7fc4278..f19f627 100644
> --- a/arch/arm/include/asm/mach/pci.h
> +++ b/arch/arm/include/asm/mach/pci.h
> @@ -44,9 +44,6 @@ struct hw_pci {
> * Per-controller structure
> */
domain in hw_pci also should be clean up, right ?
struct hw_pci {
#ifdef CONFIG_PCI_DOMAINS
int domain;
#endif
struct pci_ops *ops;
int nr_controllers;
void **private_data;
> struct pci_sys_data {
> -#ifdef CONFIG_PCI_DOMAINS
> - int domain;
> -#endif
> struct list_head node;
> int busnr; /* primary bus number */
> u64 mem_offset; /* bus->cpu memory mapping offset */
> diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
> index 7e95d85..585dc33 100644
> --- a/arch/arm/include/asm/pci.h
> +++ b/arch/arm/include/asm/pci.h
> @@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void)
> }
>
> #ifdef CONFIG_PCI_DOMAINS
> -static inline int pci_domain_nr(struct pci_bus *bus)
> -{
> - struct pci_sys_data *root = bus->sysdata;
> -
> - return root->domain;
> -}
> -
> static inline int pci_proc_domain(struct pci_bus *bus)
> {
> return pci_domain_nr(bus);
> diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
> index 17a26c1..d8c2b4e 100644
> --- a/arch/arm/kernel/bios32.c
> +++ b/arch/arm/kernel/bios32.c
> @@ -11,6 +11,8 @@
> #include <linux/slab.h>
> #include <linux/init.h>
> #include <linux/io.h>
> +#include <linux/of.h>
> +#include <linux/of_pci.h>
>
> #include <asm/mach-types.h>
> #include <asm/mach/map.h>
> @@ -468,9 +470,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> if (!sys)
> panic("PCI: unable to allocate sys data!");
>
> -#ifdef CONFIG_PCI_DOMAINS
> - sys->domain = hw->domain;
> -#endif
> sys->busnr = busnr;
> sys->swizzle = hw->swizzle;
> sys->map_irq = hw->map_irq;
> @@ -511,6 +510,27 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> }
> }
>
> +#ifdef CONFIG_PCI_DOMAINS_GENERIC
> +static bool dt_domain_found;
> +
> +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
> +{
> + int domain = of_get_pci_domain_nr(parent->of_node);
> +
> + if (domain >= 0) {
> + dt_domain_found = true;
> + } else if (dt_domain_found == true) {
> + dev_err(parent, "Node %s is missing \"linux,pci-domain\" property in DT\n",
> + parent->of_node->full_name);
> + return;
> + } else {
> + domain = pci_get_new_domain_nr();
> + }
> +
> + bus->domain_nr = domain;
> +}
> +#endif
> +
> void pci_common_init_dev(struct device *parent, struct hw_pci *hw)
> {
> struct pci_sys_data *sys;
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index b1315e1..2b4c1f2 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -722,17 +722,11 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
> {
> struct mvebu_pcie *pcie = sys_to_pcie(sys);
> int i;
> - int domain = 0;
>
> -#ifdef CONFIG_PCI_DOMAINS
> - domain = sys->domain;
> -#endif
> -
> - snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x",
> - domain);
> + snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x", nr);
> pcie->mem.name = pcie->mem_name;
>
> - snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", domain);
> + snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", nr);
> pcie->realio.name = pcie->io_name;
>
> if (request_resource(&iomem_resource, &pcie->mem))
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> index dfed00a..6790b87 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -502,9 +502,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
> dw_pci.private_data = (void **)&pp;
>
> pci_common_init_dev(pp->dev, &dw_pci);
> -#ifdef CONFIG_PCI_DOMAINS
> - dw_pci.domain++;
> -#endif
>
> return 0;
> }
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 61158e0..b6b859e 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -404,9 +404,6 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie)
> rcar_pci.private_data = (void **)&pcie;
>
> pci_common_init_dev(&pdev->dev, &rcar_pci);
> -#ifdef CONFIG_PCI_DOMAINS
> - rcar_pci.domain++;
> -#endif
> }
>
> static int phy_wait_for_ack(struct rcar_pcie *pcie)
>
--
Thanks!
Yijing
^ permalink raw reply [flat|nested] 32+ messages in thread* Re: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains
2014-11-03 3:48 ` Yijing Wang
@ 2014-11-03 10:49 ` Lorenzo Pieralisi
0 siblings, 0 replies; 32+ messages in thread
From: Lorenzo Pieralisi @ 2014-11-03 10:49 UTC (permalink / raw)
To: Yijing Wang
Cc: linux-arm-kernel, linux-pci, Liviu Dudau, Arnd Bergmann,
Phil Edworthy, Jason Gunthorpe, Jingoo Han, Bjorn Helgaas,
Russell King, Mohit Kumar
On Mon, Nov 03, 2014 at 03:48:23AM +0000, Yijing Wang wrote:
> On 2014/10/30 19:44, Lorenzo Pieralisi wrote:
[...]
> > diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
> > index 7fc4278..f19f627 100644
> > --- a/arch/arm/include/asm/mach/pci.h
> > +++ b/arch/arm/include/asm/mach/pci.h
> > @@ -44,9 +44,6 @@ struct hw_pci {
> > * Per-controller structure
> > */
>
> domain in hw_pci also should be clean up, right ?
>
>
> struct hw_pci {
> #ifdef CONFIG_PCI_DOMAINS
> int domain;
> #endif
> struct pci_ops *ops;
> int nr_controllers;
> void **private_data;
Yes, thanks for spotting that.
Lorenzo
^ permalink raw reply [flat|nested] 32+ messages in thread