[PATCH 2/3] PCI: rcar-internal-pci: Add call to get domain nr

Discussion:

Phil Edworthy

2014-09-22 09:51:09 UTC

R-Car devices (r8a7790 and r8a7791) need to place the internal PCI and external
PCIe controllers on separate domains so that they can work at the same time.

Signed-off-by: Phil Edworthy <***@renesas.com>
---
drivers/pci/host/pci-rcar-gen2.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c
index 3ef854f..17681ea 100644
--- a/drivers/pci/host/pci-rcar-gen2.c
+++ b/drivers/pci/host/pci-rcar-gen2.c
@@ -99,6 +99,7 @@ struct rcar_pci_priv {
struct resource io_res;
struct resource mem_res;
struct resource *cfg_res;
+ int domain;
unsigned busnr;
int irq;
unsigned long window_size;
@@ -373,6 +374,8 @@ static int rcar_pci_probe(struct platform_device *pdev)

priv->window_size = SZ_1G;

+ priv->domain = of_pci_get_domain_nr(pdev->dev.of_node, true);
+
if (pdev->dev.of_node) {
struct resource busnr;
int ret;
@@ -397,6 +400,9 @@ static int rcar_pci_probe(struct platform_device *pdev)
hw.map_irq = rcar_pci_map_irq;
hw.ops = &rcar_pci_ops;
hw.setup = rcar_pci_setup;
+#ifdef CONFIG_PCI_DOMAINS
+ hw.domain = priv->domain;
+#endif
pci_common_init_dev(&pdev->dev, &hw);
return 0;
}

--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Phil Edworthy

2014-09-22 09:51:10 UTC

Permalink

Since there are ARM devices with multiple independant PCI controllers, enable
PCI domains for all ARM devices.

Signed-off-by: Phil Edworthy <***@renesas.com>
---
Marked as RFC as I am not sure of the impact of enabling PCI domains for all
ARM devices. In the march to 'one kernel to rule them all', I steered clear of
mach specific changes.

arch/arm/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 32cbbd5..8741d3d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1274,6 +1274,7 @@ config ISA_DMA_API

config PCI
bool "PCI support" if MIGHT_HAVE_PCI
+ select PCI_DOMAINS
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
@@ -1282,7 +1283,6 @@ config PCI

config PCI_DOMAINS
bool
- depends on PCI

config PCI_NANOENGINE
bool "BSE nanoEngine PCI support"

--
2.1.0

Phil Edworthy

2014-09-22 09:51:08 UTC

Permalink

R-Car devices (r8a7790 and r8a7791) need to place the internal PCI and external
PCIe controllers on separate domains so that they can work at the same time.

Signed-off-by: Phil Edworthy <***@renesas.com>
---
drivers/pci/host/pcie-rcar.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 4884ee5..db74371 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -128,6 +128,7 @@ struct rcar_pcie {
struct device *dev;
void __iomem *base;
struct resource res[RCAR_PCI_MAX_RESOURCES];
+ int domain;
struct resource busn;
int root_bus_nr;
struct clk *clk;
@@ -393,13 +394,13 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie)
{
struct platform_device *pdev = to_platform_device(pcie->dev);

+#ifdef CONFIG_PCI_DOMAINS
+ rcar_pci.domain = pcie->domain;
+#endif
rcar_pci.nr_controllers = 1;
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)
@@ -917,6 +918,8 @@ static int rcar_pcie_probe(struct platform_device *pdev)
pcie->dev = &pdev->dev;
platform_set_drvdata(pdev, pcie);

+ pcie->domain = of_pci_get_domain_nr(pdev->dev.of_node, true);
+
/* Get the bus range */
if (of_pci_parse_bus_range(pdev->dev.of_node, &pcie->busn)) {
dev_err(&pdev->dev, "failed to parse bus-range property\n");

--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Liviu Dudau

2014-09-22 11:28:50 UTC

Permalink

The Renesas R-Car devices (r8a7790 and r8a7791) use two PCI controlle=

r drivers,

one for an external PCIe slot, the other for an internal PCI bridge t=

o USB

controllers.
=20
However, they currently do not work at the same time as they use the =

same PCI

domain and use the same root bus number. We can't use different root =

bus numbers

due to the way root bus numbers are assigned in pcibios_init_hw() in
arch/arm/kernel/bios32.c.
=20
Since the two PCI controllers are completely independent, I think it =

makes sense

to use different PCI domains for them.
=20
I've marked the third patch as RFC as I am not sure of the impact of =

enabling

PCI domains for all ARM devices. In the march to 'one kernel to rule =

them all',

I steered clear of mach specific changes.
=20
[PATCH v11 07/10] OF: Introduce helper function for getting PCI dom=

ain_nr

Based on comments on this patch from Jason Gunthorpe, there is still =

the issue

that the domain numbers may change depending on the ordering at probe=

time.

However, this can be fixed later on by adding the entries in the DT f=

iles.

Hi Phil,

I'm happy that you found use for my patch, but I can't help wondering i=
f it is
not a better idea to convert your drivers to the whole new API in my se=
ries.
Do you have any thoughts on that?

One other thing to note: Rob Herring is not very happy with the mix of =
OF
parsing and domain number allocation going in together, so I might remo=
ve the
OF parsing entirely for now. Would that cause you any problems (other t=
han
the fact that if of_pci_get_domain_nr() doesn't do anything OF related =
I might
rename it to pci_get_domain_nr()). You don't seem to have any alias def=
ined
for pci-domain in the DT, so I'll guess not.

Best regards,
Liviu

=20
=20
PCI: rcar-pcie: Add call to get domain nr
PCI: rcar-internal-pci: Add call to get domain nr
ARM: Enable PCI domains
=20
arch/arm/Kconfig | 2 +-
drivers/pci/host/pci-rcar-gen2.c | 6 ++++++
drivers/pci/host/pcie-rcar.c | 9 ++++++---
3 files changed, 13 insertions(+), 4 deletions(-)
=20
--=20
2.1.0
=20
=20

--=20
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
=C2=AF\_(=E3=83=84)_/=C2=AF

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Phil Edworthy

2014-09-22 11:40:42 UTC

Permalink

Hi Liviu,

Post by Liviu Dudau

The Renesas R-Car devices (r8a7790 and r8a7791) use two PCI controller

drivers,

one for an external PCIe slot, the other for an internal PCI bridge to USB
controllers.
However, they currently do not work at the same time as they use the

same PCI

domain and use the same root bus number. We can't use different root

bus numbers

due to the way root bus numbers are assigned in pcibios_init_hw() in
arch/arm/kernel/bios32.c.
Since the two PCI controllers are completely independent, I think it makes

sense

to use different PCI domains for them.
I've marked the third patch as RFC as I am not sure of the impact of

enabling

PCI domains for all ARM devices. In the march to 'one kernel to rule them

all',

I steered clear of mach specific changes.
[PATCH v11 07/10] OF: Introduce helper function for getting PCI

domain_nr

Based on comments on this patch from Jason Gunthorpe, there is still the

issue

that the domain numbers may change depending on the ordering at probe

time.

However, this can be fixed later on by adding the entries in the DT files.

Hi Phil,
I'm happy that you found use for my patch, but I can't help wondering if it is
not a better idea to convert your drivers to the whole new API in my series.
Do you have any thoughts on that?

The main reason being that Renesas also supports the LTSI trees, so this fix
will also need backporting to v3.10.

Post by Liviu Dudau
One other thing to note: Rob Herring is not very happy with the mix of OF
parsing and domain number allocation going in together, so I might remove
the
OF parsing entirely for now. Would that cause you any problems (other than
the fact that if of_pci_get_domain_nr() doesn't do anything OF related I
might
rename it to pci_get_domain_nr()). You don't seem to have any alias defined
for pci-domain in the DT, so I'll guess not.

In the covering letter I mentioned that controllers should always use the same
domain number, so I was planning to add pci-domain into the DTs later on.

Thanks
Phil
��칻�&�~�&��+-��ݶ��w��˛��m�b��l�)��w*jg��ݢj/��z�ޖ��

Liviu Dudau

2014-09-22 12:02:22 UTC

Permalink

Post by Phil Edworthy
Hi Liviu,
=20

Post by Liviu Dudau

The Renesas R-Car devices (r8a7790 and r8a7791) use two PCI contr=

oller