Enable PCIe port 1 on QNAP TS-11x/TS-21x
Subsystems (2)
PATCH 1/1 Enable PCIe port 1 on QNAP TS-11x/TS-21x
Enable KW_PCIE1 on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!
arch/arm/mach-kirkwood/board-ts219.c +1 -1
@@ -46,7 +46,7 @@ void __init qnap_dt_ts219_init(void)static int __init ts219_pci_init (void ) {if (machine_is_ts219 ()) -kirkwood_pcie_init (KW_PCIE0 ); +kirkwood_pcie_init (KW_PCIE1 |KW_PCIE0 );return 0 ; }
arch/arm/mach-kirkwood/ts219-setup.c +1 -1
@@ -124,7 +124,7 @@ static void __init qnap_ts219_init(void)static int __init ts219_pci_init (void ) {if (machine_is_ts219 ()) -kirkwood_pcie_init (KW_PCIE0 ); +kirkwood_pcie_init (KW_PCIE1 |KW_PCIE0 );return 0 ; }
Signature · 2 lines
Martin Michlmayr http://www.cyrius.com/
PATCH 1/1 Enable PCIe port 1 on QNAP TS-11x/TS-21x
Quoted 13 lines · Martin Michlmayr
Enable
KW_PCIE1on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!Cc <[email protected]>Signed-off-by Martin Michlmayr <[email protected]>Tested-by Marek Vasut <[email protected]>arch/arm/mach-kirkwood/board-ts219.c +0
-0
arch/arm/mach-kirkwood/board-ts219.c void __init qnap_dt_ts219_init(void) · line 50
Quoted 6 lines
arch/arm/mach-kirkwood/board-ts219.c +1
-1@@ -46,7 +46,7 @@ void __init qnap_dt_ts219_init(void)static int __init ts219_pci_init (void ) {if (machine_is_ts219 ()) -kirkwood_pcie_init (KW_PCIE0 ); +kirkwood_pcie_init (KW_PCIE1 |KW_PCIE0 );
Hi Martin
For the DT based board, this will not help. Did you notice the FIXME?
Now that i know both ports are needed, i will fix the DT for 3.11 when we introduce PCI bindings via DT.
arch/arm/mach-kirkwood/ts219-setup.c static void __init qnap_ts219_init(void) · line 127
Quoted 12 lines
arch/arm/mach-kirkwood/board-ts219.c +0
-0return 0 ; }arch/arm/mach-kirkwood/ts219-setup.c +1
-1@@ -124,7 +124,7 @@ static void __init qnap_ts219_init(void)static int __init ts219_pci_init (void ) {if (machine_is_ts219 ()) -kirkwood_pcie_init (KW_PCIE0 ); +kirkwood_pcie_init (KW_PCIE1 |KW_PCIE0 );
This looks correct. Please could you submit a new version with just this hunk. Since its a fix, we can probably get it quickly into 3.10 and then into stable.
Thanks
Andrew
PATCH 1/1 Enable PCIe port 1 on QNAP TS-11x/TS-21x
Quoted 1 line · Andrew Lunn
For the DT based board, this will not help. Did you notice the FIXME?
Yes, and I've read your discussions about this topic in the meantime.
I'll send a new patch for the non-DT case only since this is what's relevant for current kernels.
Quoted 2 lines
Now that i know both ports are needed, i will fix the DT for 3.11 when we introduce PCI bindings via DT.
Thanks.
Signature · 2 lines
Martin Michlmayr http://www.cyrius.com/
PATCH 1/1 Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
In reply to Andrew LunnEnable KW_PCIE1 on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!
arch/arm/mach-kirkwood/ts219-setup.c +1 -1
@@ -124,7 +124,7 @@ static void __init qnap_ts219_init(void)static int __init ts219_pci_init (void ) {if (machine_is_ts219 ()) -kirkwood_pcie_init (KW_PCIE0 ); +kirkwood_pcie_init (KW_PCIE1 |KW_PCIE0 );return 0 ; }
Signature · 2 lines
Martin Michlmayr http://www.cyrius.com/
PATCH 1/1 Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
Quoted 13 lines · Martin Michlmayr
Enable
KW_PCIE1on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!Cc <[email protected]>Signed-off-by Martin Michlmayr <[email protected]>Tested-by Marek Vasut <[email protected]>arch/arm/mach-kirkwood/ts219-setup.c +0
-0
arch/arm/mach-kirkwood/ts219-setup.c static void __init qnap_ts219_init(void) · line 130
Quoted 8 lines
arch/arm/mach-kirkwood/ts219-setup.c +1
-1@@ -124,7 +124,7 @@ static void __init qnap_ts219_init(void)static int __init ts219_pci_init (void ) {if (machine_is_ts219 ()) -kirkwood_pcie_init (KW_PCIE0 ); +kirkwood_pcie_init (KW_PCIE1 |KW_PCIE0 );return 0 ; }
Andrew
Jason Cooper
AppliedPATCH 1/1 Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
In reply to Martin MichlmayrQuoted 7 lines · Martin Michlmayr
Enable
KW_PCIE1on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!Cc <[email protected]>Signed-off-by Martin Michlmayr <[email protected]>Tested-by Marek Vasut <[email protected]>
Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 once it drops. I'll submit a pull request then.
fyi: looks like this can be applied to stable all the way back to v2.6.36.x, updated stable tag accordingly.
thx,
Jason.
PATCH 1/1 Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
Quoted 9 lines · Jason Cooper
Quoted 7 lines · Martin Michlmayr
Enable
KW_PCIE1on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!Cc <[email protected]>Signed-off-by Martin Michlmayr <[email protected]>Tested-by Marek Vasut <[email protected]>
Quoted 5 lines
Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 once it drops. I'll submit a pull request then.
fyi: looks like this can be applied to stable all the way back to v2.6.36.x, updated stable tag accordingly.
Hi Jason
Once we have v3.10-rc1 with the DT PCI patches, i will also make an update to them to enable both PCI ports where available.
We should also change the kirkwood_defconfig to enable the PCI USB 3.0. driver. I can do that as well.
Andrew
PATCH 1/1 Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
Quoted 16 lines · Andrew Lunn
Quoted 9 lines · Jason Cooper
Quoted 7 lines · Martin Michlmayr
Enable
KW_PCIE1on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!Cc <[email protected]>Signed-off-by Martin Michlmayr <[email protected]>Tested-by Marek Vasut <[email protected]>Quoted 5 lines
Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 once it drops. I'll submit a pull request then.
fyi: looks like this can be applied to stable all the way back to v2.6.36.x, updated stable tag accordingly.
Quoted 7 lines
Hi Jason
Once we have v3.10-rc1 with the DT PCI patches, i will also make an update to them to enable both PCI ports where available.
We should also change the
kirkwood_defconfigto enable the PCI USB 3.0. driver. I can do that as well.
Great! That'll wrap up the other half of the first version of this patch.
thx,
Jason.
PATCH 1/1 Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
In reply to Andrew LunnQuoted 16 lines · Andrew Lunn
Quoted 9 lines · Jason Cooper
Quoted 7 lines · Martin Michlmayr
Enable
KW_PCIE1on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!Cc <[email protected]>Signed-off-by Martin Michlmayr <[email protected]>Tested-by Marek Vasut <[email protected]>Quoted 5 lines
Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 once it drops. I'll submit a pull request then.
fyi: looks like this can be applied to stable all the way back to v2.6.36.x, updated stable tag accordingly.
Quoted 7 lines
Hi Jason
Once we have v3.10-rc1 with the DT PCI patches, i will also make an update to them to enable both PCI ports where available.
We should also change the
kirkwood_defconfigto enable the PCI USB 3.0. driver. I can do that as well.
Do you have these ready to post? No rush, just didn't want to see it fall off the table...
thx,
Jason.
PATCH 1/1 Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
In reply to Jason CooperQuoted 11 lines · Jason Cooper
Quoted 7 lines · Martin Michlmayr
Enable
KW_PCIE1on QNAP TS-11x/TS-21x devices as newer revisions (rev 1.3) have a USB 3.0 chip from Etron on PCIe port 1. Thanks to Marek Vasut for identifying this issue!Cc <[email protected]>Signed-off-by Martin Michlmayr <[email protected]>Tested-by Marek Vasut <[email protected]>Applied to mvebu-next/fixes. This branch will be rebased onto v3.10-rc1 once it drops. I'll submit a pull request then.
mvebu-next/fixes is now mvebu/fixes and has been rebased onto mvebu/fixes. This patch is included.
thx,
Jason.