Skip to contentSkip to conversation

arm: kirkwood: convert NETGEAR ReadyNAS Duo v2 to use DT for the PCIe interface

PATCH New Arnaud Ebalard 3 participants 7 messages May 28, 2013 – May 29, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: kirkwood: convert NETGEAR ReadyNAS Duo v2 to use DT for the PCIe interface

Hi Jason and Thomas,

Thomas, I am following your work on PCIe support for a .dts file I am working on for (Armada 370-based) Netgear ReadyNAS 102 and noticed your set of patches to convert kirkwood-based boards to use it in order to simplify/remove board specific code.

Jason, I gave your associated branch (jcooper/mvebu-next/pcie) a try with following patch applied and can confirm USB 3.0 host controller (connected to PCIe bus) is usable on Netgear ReadyNAS *Duo v2* (88f6282-based brother of the 102).

Note that I had to s/of_pci_range_parser()/of_pci_range_parser_init()/ in drivers/pci/host/pci-mvebu.c to compile the kernel (this may already have been fixed already):

CHK kernel/config_data.h
drivers/pci/host/pci-mvebu.c: In function ?mvebu_pcie_probe?:
drivers/pci/host/pci-mvebu.c:742:2: error: implicit declaration of function ?of_pci_range_parser? [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[3]: *** [drivers/pci/host/pci-mvebu.o] Error 1
make[2]: *** [drivers/pci/host] Error 2
make[1]: *** [drivers/pci] Error 2
make[1]: *** Waiting for unfinished jobs....

Can one of you take the patch below into account? Or

Cheers,

a+

---
 arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts |    8 ++++++++
 arch/arm/mach-kirkwood/board-readynas.c                |    1 -
 2 files changed, 8 insertions(+), 1 deletion(-)
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +8 -0
index 1ca66ab..f9706da 100644
@@ -111,6 +111,14 @@
 			status = "okay";
 			nr-ports = <2>;
 		};
+
+		pcie-controller {
+			status = "okay";
+
+			pcie at 1,0 {
+				 status = "okay";
+			};
+		};
 	};
 
 	gpio-leds {
arch/arm/mach-kirkwood/board-readynas.c +0 -1
index fb42c20..341b82d 100644
@@ -24,5 +24,4 @@ static struct mv643xx_eth_platform_data netgear_readynas_ge00_data = {
 void __init netgear_readynas_init(void)
 {
 	kirkwood_ge00_init(&netgear_readynas_ge00_data);
-	kirkwood_pcie_init(KW_PCIE0);
 }
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 arm: kirkwood: convert NETGEAR ReadyNAS Duo v2 to use DT for the PCIe interface

Dear Arnaud Ebalard,

Quoted 4 lines · Arnaud Ebalard

Thomas, I am following your work on PCIe support for a .dts file I am working on for (Armada 370-based) Netgear ReadyNAS 102 and noticed your set of patches to convert kirkwood-based boards to use it in order to simplify/remove board specific code.

Nice!

Quoted 5 lines

Jason, I gave your associated branch (jcooper/mvebu-next/pcie) a try with following patch applied and can confirm USB 3.0 host controller (connected to PCIe bus) is usable on Netgear ReadyNAS *Duo v2* (88f6282-based brother of the 102).

Quoted 8 lines

Note that I had to s/of_pci_range_parser()/of_pci_range_parser_init()/ in drivers/pci/host/pci-mvebu.c to compile the kernel (this may already have been fixed already):

CHK kernel/config_data.h
drivers/pci/host/pci-mvebu.c: In function ?mvebu_pcie_probe?:
drivers/pci/host/pci-mvebu.c:742:2: error: implicit declaration of function ?of_pci_range_parser? [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors

You're probably not using the latest mvebu/pcie branch from jcooper. In his branch, I see:

+ if (of_pci_range_parser_init(&parser, np))
+ return -EINVAL;

Which should do the right thing.

Could you check that you're running on top of the latest jcooper/mvebu/pcie branch? Thanks!

Quoted 1 line

Can one of you take the patch below into account? Or

You should probably resend your patch with a proper description. Your description now includes a lot information about unrelated things (the Armada 370 board you're working on, the build failure you had, etc.).

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 arm: kirkwood: convert NETGEAR ReadyNAS Duo v2 to use DT for the PCIe interface

Quoted 21 lines · Thomas Petazzoni
Quoted 5 lines · Arnaud Ebalard

Jason, I gave your associated branch (jcooper/mvebu-next/pcie) a try with following patch applied and can confirm USB 3.0 host controller (connected to PCIe bus) is usable on Netgear ReadyNAS *Duo v2* (88f6282-based brother of the 102).

Quoted 8 lines

Note that I had to s/of_pci_range_parser()/of_pci_range_parser_init()/ in drivers/pci/host/pci-mvebu.c to compile the kernel (this may already have been fixed already):

CHK kernel/config_data.h
drivers/pci/host/pci-mvebu.c: In function ?mvebu_pcie_probe?:
drivers/pci/host/pci-mvebu.c:742:2: error: implicit declaration of function ?of_pci_range_parser? [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors

You're probably not using the latest mvebu/pcie branch from jcooper. In his branch, I see:

(quoted diff) +2 -0
+       if (of_pci_range_parser_init(&parser, np))
+               return -EINVAL;
Quoted 4 lines

Which should do the right thing.

Could you check that you're running on top of the latest jcooper/mvebu/pcie branch? Thanks!

Actually, you want jcooper/mvebu/pcie_kirkwood. I split out the kirkwood driver so that if it causes a build breakage and gets dropped, mvebu/pcie can still go in.

Quoted 5 lines
Quoted 1 line

Can one of you take the patch below into account? Or

You should probably resend your patch with a proper description. Your description now includes a lot information about unrelated things (the Armada 370 board you're working on, the build failure you had, etc.).

That stuff can go below the '---' in the future. Don't stress about it, though. I'll clean it up when I apply it if needed.

thx,

Jason.

#3 lore raw

PATCH 1/1 arm: kirkwood: convert NETGEAR ReadyNAS Duo v2 to use DT for the PCIe interface

Dear Jason Cooper,

Quoted 6 lines · Jason Cooper
Quoted 2 lines

Could you check that you're running on top of the latest jcooper/mvebu/pcie branch? Thanks!

Actually, you want jcooper/mvebu/pcie_kirkwood. I split out the kirkwood driver so that if it causes a build breakage and gets dropped, mvebu/pcie can still go in.

There's not really a "kirkwood" driver for PCIe. The pcie-kirkwood stuff is really all about adding the right Device Tree informations, and switching from a legacy-style probing to a DT-style probing.

That said, I definitely agree with the idea of having that as a separate branch.

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#4 lore raw

PATCH 1/1 arm: kirkwood: convert NETGEAR ReadyNAS Duo v2 to use DT for the PCIe interface

Quoted 5 lines · Thomas Petazzoni
Quoted 3 lines · Jason Cooper
Quoted 2 lines

Could you check that you're running on top of the latest jcooper/mvebu/pcie branch? Thanks!

Quoted 7 lines
Quoted 3 lines

Actually, you want jcooper/mvebu/pcie_kirkwood. I split out the kirkwood driver so that if it causes a build breakage and gets dropped, mvebu/pcie can still go in.

There's not really a "kirkwood" driver for PCIe. The pcie-kirkwood stuff is really all about adding the right Device Tree informations, and switching from a legacy-style probing to a DT-style probing.

Agreed. Bad word choice on my part. It was late/early, too much/too little coffee. ;-)

You still need mvebu/pcie_kirkwood for:

005625f pci: mvebu: enable driver usage on Kirkwood

thx,

Jason.

#5 lore raw

PATCH 1/1 arm: kirkwood: convert NETGEAR ReadyNAS Duo v2 to use DT for the PCIe interface

In reply to Arnaud Ebalard
Quoted 29 lines · Arnaud Ebalard

Hi Jason and Thomas,

Thomas, I am following your work on PCIe support for a .dts file I am working on for (Armada 370-based) Netgear ReadyNAS 102 and noticed your set of patches to convert kirkwood-based boards to use it in order to simplify/remove board specific code.

Jason, I gave your associated branch (jcooper/mvebu-next/pcie) a try with following patch applied and can confirm USB 3.0 host controller (connected to PCIe bus) is usable on Netgear ReadyNAS *Duo v2* (88f6282-based brother of the 102).

Note that I had to s/of_pci_range_parser()/of_pci_range_parser_init()/ in drivers/pci/host/pci-mvebu.c to compile the kernel (this may already have been fixed already):

CHK kernel/config_data.h
drivers/pci/host/pci-mvebu.c: In function ?mvebu_pcie_probe?:
drivers/pci/host/pci-mvebu.c:742:2: error: implicit declaration of function ?of_pci_range_parser? [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[3]: *** [drivers/pci/host/pci-mvebu.o] Error 1
make[2]: *** [drivers/pci/host] Error 2
make[1]: *** [drivers/pci] Error 2
make[1]: *** Waiting for unfinished jobs....

Can one of you take the patch below into account? Or

Cheers,

Quoted 7 lines

a+

---
 arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts |    8 ++++++++
 arch/arm/mach-kirkwood/board-readynas.c                |    1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

Hey, I had a little time to kill, so I went ahead and fixed this up. Let me know if this looks ok. I've applied it to mvebu/pcie_kirkwood, so you should just be able to pull that and test it. I'll push it up to arm-soc in a week or so.

thx,

Jason.

---->8-----
commit 6bd98481ab346964344e05a041f35ff83cb3d00c

Author: Arnaud Ebalard <[email protected]>
Date:   Wed May 29 11:37:52 2013 +0000

arm: kirkwood: NETGEAR ReadyNAS Duo v2 init PCIe via DT

Now that the mvebu-pcie driver is in place and enabled for kirkwood, convert to initializing PCIe via devicetree.

arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +8 -0
index 1ca66ab..0f852b4 100644
@@ -111,6 +111,14 @@
 			status = "okay";
 			nr-ports = <2>;
 		};
+
+		pcie-controller {
+			status = "okay";
+
+			pcie at 1,0 {
+				status = "okay";
+			};
+		};
 	};
 
 	gpio-leds {
arch/arm/mach-kirkwood/board-readynas.c +0 -1
index fb42c20..341b82d 100644
@@ -24,5 +24,4 @@ static struct mv643xx_eth_platform_data netgear_readynas_ge00_data = {
 void __init netgear_readynas_init(void)
 {
 	kirkwood_ge00_init(&netgear_readynas_ge00_data);
-	kirkwood_pcie_init(KW_PCIE0);
 }
#6 lore raw

PATCH 1/1 arm: kirkwood: convert NETGEAR ReadyNAS Duo v2 to use DT for the PCIe interface

Hi Jason,

Quoted 8 lines · Jason Cooper
Quoted 3 lines
 arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts |    8 ++++++++
 arch/arm/mach-kirkwood/board-readynas.c                |    1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

Hey, I had a little time to kill, so I went ahead and fixed this up. Let me know if this looks ok. I've applied it to mvebu/pcie_kirkwood, so you should just be able to pull that and test it. I'll push it up to arm-soc in a week or so.

Pulled the branch, compiled and tested it: USB 3.0 host controller connected to PCIe bus works as expected.

Thanks for your work,

Cheers,

a+