* [PATCH] Enable PCIe port 1 on QNAP TS-11x/TS-21x
@ 2013-04-21 15:28 Martin Michlmayr
2013-04-21 15:47 ` Andrew Lunn
0 siblings, 1 reply; 10+ messages in thread
From: Martin Michlmayr @ 2013-04-21 15:28 UTC (permalink / raw)
To: linux-arm-kernel
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!
Cc: <stable@kernel.org>
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Tested-by: Marek Vasut <marex@denx.de>
diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
index acb0187..651e6b3 100644
--- a/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@ -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;
}
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
index 283abff..e1267d6 100644
--- a/arch/arm/mach-kirkwood/ts219-setup.c
+++ b/arch/arm/mach-kirkwood/ts219-setup.c
@@ -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;
}
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH] Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-21 15:28 [PATCH] Enable PCIe port 1 on QNAP TS-11x/TS-21x Martin Michlmayr
@ 2013-04-21 15:47 ` Andrew Lunn
2013-04-21 16:12 ` Martin Michlmayr
2013-04-21 16:14 ` [PATCH] Kirkwood: " Martin Michlmayr
0 siblings, 2 replies; 10+ messages in thread
From: Andrew Lunn @ 2013-04-21 15:47 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 04:28:02PM +0100, Martin Michlmayr wrote:
> 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!
>
> Cc: <stable@kernel.org>
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> Tested-by: Marek Vasut <marex@denx.de>
>
> diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
> index acb0187..651e6b3 100644
> --- a/arch/arm/mach-kirkwood/board-ts219.c
> +++ b/arch/arm/mach-kirkwood/board-ts219.c
> @@ -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.
> return 0;
> }
> diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
> index 283abff..e1267d6 100644
> --- a/arch/arm/mach-kirkwood/ts219-setup.c
> +++ b/arch/arm/mach-kirkwood/ts219-setup.c
> @@ -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
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH] Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-21 15:47 ` Andrew Lunn
@ 2013-04-21 16:12 ` Martin Michlmayr
2013-04-21 16:14 ` [PATCH] Kirkwood: " Martin Michlmayr
1 sibling, 0 replies; 10+ messages in thread
From: Martin Michlmayr @ 2013-04-21 16:12 UTC (permalink / raw)
To: linux-arm-kernel
* Andrew Lunn <andrew@lunn.ch> [2013-04-21 17:47]:
> 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.
> Now that i know both ports are needed, i will fix the DT for 3.11 when
> we introduce PCI bindings via DT.
Thanks.
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-21 15:47 ` Andrew Lunn
2013-04-21 16:12 ` Martin Michlmayr
@ 2013-04-21 16:14 ` Martin Michlmayr
2013-04-21 17:03 ` Andrew Lunn
2013-04-29 17:30 ` Jason Cooper
1 sibling, 2 replies; 10+ messages in thread
From: Martin Michlmayr @ 2013-04-21 16:14 UTC (permalink / raw)
To: linux-arm-kernel
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!
Cc: <stable@kernel.org>
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Tested-by: Marek Vasut <marex@denx.de>
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
index 283abff..e1267d6 100644
--- a/arch/arm/mach-kirkwood/ts219-setup.c
+++ b/arch/arm/mach-kirkwood/ts219-setup.c
@@ -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;
}
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH] Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-21 16:14 ` [PATCH] Kirkwood: " Martin Michlmayr
@ 2013-04-21 17:03 ` Andrew Lunn
2013-04-29 17:30 ` Jason Cooper
1 sibling, 0 replies; 10+ messages in thread
From: Andrew Lunn @ 2013-04-21 17:03 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote:
> 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!
>
> Cc: <stable@kernel.org>
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> Tested-by: Marek Vasut <marex@denx.de>
>
> diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
> index 283abff..e1267d6 100644
> --- a/arch/arm/mach-kirkwood/ts219-setup.c
> +++ b/arch/arm/mach-kirkwood/ts219-setup.c
> @@ -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;
> }
Acked-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH] Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-21 16:14 ` [PATCH] Kirkwood: " Martin Michlmayr
2013-04-21 17:03 ` Andrew Lunn
@ 2013-04-29 17:30 ` Jason Cooper
2013-04-29 18:03 ` Andrew Lunn
2013-05-13 16:01 ` Jason Cooper
1 sibling, 2 replies; 10+ messages in thread
From: Jason Cooper @ 2013-04-29 17:30 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote:
> 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!
>
> Cc: <stable@kernel.org>
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> Tested-by: Marek Vasut <marex@denx.de>
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.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-29 17:30 ` Jason Cooper
@ 2013-04-29 18:03 ` Andrew Lunn
2013-04-29 18:24 ` Jason Cooper
2013-05-13 16:45 ` Jason Cooper
2013-05-13 16:01 ` Jason Cooper
1 sibling, 2 replies; 10+ messages in thread
From: Andrew Lunn @ 2013-04-29 18:03 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Apr 29, 2013 at 01:30:22PM -0400, Jason Cooper wrote:
> On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote:
> > 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!
> >
> > Cc: <stable@kernel.org>
> > Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> > Tested-by: Marek Vasut <marex@denx.de>
>
> 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
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH] Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-29 18:03 ` Andrew Lunn
@ 2013-04-29 18:24 ` Jason Cooper
2013-05-13 16:45 ` Jason Cooper
1 sibling, 0 replies; 10+ messages in thread
From: Jason Cooper @ 2013-04-29 18:24 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Apr 29, 2013 at 08:03:38PM +0200, Andrew Lunn wrote:
> On Mon, Apr 29, 2013 at 01:30:22PM -0400, Jason Cooper wrote:
> > On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote:
> > > 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!
> > >
> > > Cc: <stable@kernel.org>
> > > Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> > > Tested-by: Marek Vasut <marex@denx.de>
> >
> > 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.
Great! That'll wrap up the other half of the first version of this
patch.
thx,
Jason.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-29 18:03 ` Andrew Lunn
2013-04-29 18:24 ` Jason Cooper
@ 2013-05-13 16:45 ` Jason Cooper
1 sibling, 0 replies; 10+ messages in thread
From: Jason Cooper @ 2013-05-13 16:45 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Apr 29, 2013 at 08:03:38PM +0200, Andrew Lunn wrote:
> On Mon, Apr 29, 2013 at 01:30:22PM -0400, Jason Cooper wrote:
> > On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote:
> > > 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!
> > >
> > > Cc: <stable@kernel.org>
> > > Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> > > Tested-by: Marek Vasut <marex@denx.de>
> >
> > 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.
Do you have these ready to post? No rush, just didn't want to see it
fall off the table...
thx,
Jason.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
2013-04-29 17:30 ` Jason Cooper
2013-04-29 18:03 ` Andrew Lunn
@ 2013-05-13 16:01 ` Jason Cooper
1 sibling, 0 replies; 10+ messages in thread
From: Jason Cooper @ 2013-05-13 16:01 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Apr 29, 2013 at 01:30:22PM -0400, Jason Cooper wrote:
> On Sun, Apr 21, 2013 at 05:14:00PM +0100, Martin Michlmayr wrote:
> > 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!
> >
> > Cc: <stable@kernel.org>
> > Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> > Tested-by: Marek Vasut <marex@denx.de>
>
> 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.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-05-13 16:45 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-21 15:28 [PATCH] Enable PCIe port 1 on QNAP TS-11x/TS-21x Martin Michlmayr
2013-04-21 15:47 ` Andrew Lunn
2013-04-21 16:12 ` Martin Michlmayr
2013-04-21 16:14 ` [PATCH] Kirkwood: " Martin Michlmayr
2013-04-21 17:03 ` Andrew Lunn
2013-04-29 17:30 ` Jason Cooper
2013-04-29 18:03 ` Andrew Lunn
2013-04-29 18:24 ` Jason Cooper
2013-05-13 16:45 ` Jason Cooper
2013-05-13 16:01 ` Jason Cooper
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.