diff mbox series

powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch

Message ID 20211230104329.677138-1-bigunclemax@gmail.com (mailing list archive)
State Superseded
Headers show
Series powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch | expand

Checks

Context Check Description
snowpatch_ozlabs/github-powerpc_selftests success Successfully ran 8 jobs.
snowpatch_ozlabs/github-powerpc_ppctests success Successfully ran 8 jobs.
snowpatch_ozlabs/github-powerpc_sparse success Successfully ran 4 jobs.
snowpatch_ozlabs/github-powerpc_clang success Successfully ran 7 jobs.
snowpatch_ozlabs/github-powerpc_kernel_qemu success Successfully ran 24 jobs.

Commit Message

Maxim Kiselev Dec. 30, 2021, 10:43 a.m. UTC
Fix network interface names for the switch ports according to labels
that are written on the front panel of the board. They start from ETH3
and end at ETH10.

Fixes: e69eb0824d8c ("powerpc: dts: t1040rdb: add ports for Seville
Ethernet switch")
Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
Reviewed-by: Maxim Kochetkov <fido_max@inbox.ru>
---
 arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Maxim Kiselev Dec. 30, 2021, 1:24 p.m. UTC | #1
Yes, I have T1040RDB ver.b (without SFP) and my front panel looks like this.


 +---------------------------------------------------------------------+
 |                    NO SFP                                           |
 |  +-------+-------+   |           +-------+-------+-------+-------+  |
 |  | UART0 |  ETH1 |   |           |  ETH4 |  ETH6 |  ETH8 | ETH10 |  |
 |  +-------+-------+  \|/  +-------+-------+-------+-------+-------+  |
 |  | UART1 |  ETH0 |       |  ETH2 |  ETH3 |  ETH5 |  ETH7 | ETH9  |  |
 +--+-------+-------+-------+-------+-------+-------+-------+-------+--+

Same as this pic
https://habrastorage.org/files/433/d0f/057/433d0f05784f42b6acf9bb777970b1e9.jpg


чт, 30 дек. 2021 г. в 16:00, Vladimir Oltean <vladimir.oltean@nxp.com>:

> On Thu, Dec 30, 2021 at 01:43:28PM +0300, Maxim Kiselev wrote:
> > Fix network interface names for the switch ports according to labels
> > that are written on the front panel of the board. They start from ETH3
> > and end at ETH10.
> >
> > Fixes: e69eb0824d8c ("powerpc: dts: t1040rdb: add ports for Seville
> > Ethernet switch")
>
> A Fixes: tag should not wrap on multiple lines.
>
> > Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
> > Reviewed-by: Maxim Kochetkov <fido_max@inbox.ru>
> > ---
>
> Sadly I'm not able to confirm or disprove this change right now, because
> my T1040RDB has a bad DDR memory stick, it seems, so it just randomly
> hangs.
> But I'm pretty sure the Ethernet ports were properly mapped out when I
> tested them.
>
> Do you have the T1040RDB or the T1040D4RDB? Because the front panel of
> my T1040RDB looks like this:
>
>  +---------------------------------------------------------------------+
>  |                                                                     |
>  |  +-------+-------+               +-------+-------+-------+-------+  |
>  |  | UART0 |  ETH1 |               |  ETH4 |  ETH6 |  ETH8 | ETH10 |  |
>  |  +-------+-------+-------+-------+-------+-------+-------+-------+  |
>  |  | UART1 |  ETH0 |  ETH2 |  ETH3 |  ETH5 |  ETH7 |  ETH9 | ETH11 |  |
>  +--+-------+-------+-------+-------+-------+-------+-------+-------+--+
>
> >  arch/powerpc/boot/dts/fsl/t1040rdb.dts | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb.dts
> b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
> > index af0c8a6f56138..b6733e7e65805 100644
> > --- a/arch/powerpc/boot/dts/fsl/t1040rdb.dts
> > +++ b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
> > @@ -119,7 +119,7 @@ &seville_port0 {
> >       managed = "in-band-status";
> >       phy-handle = <&phy_qsgmii_0>;
> >       phy-mode = "qsgmii";
> > -     label = "ETH5";
> > +     label = "ETH3";
> >       status = "okay";
> >  };
> >
> > @@ -135,7 +135,7 @@ &seville_port2 {
> >       managed = "in-band-status";
> >       phy-handle = <&phy_qsgmii_2>;
> >       phy-mode = "qsgmii";
> > -     label = "ETH7";
> > +     label = "ETH5";
> >       status = "okay";
> >  };
> >
> > @@ -151,7 +151,7 @@ &seville_port4 {
> >       managed = "in-band-status";
> >       phy-handle = <&phy_qsgmii_4>;
> >       phy-mode = "qsgmii";
> > -     label = "ETH9";
> > +     label = "ETH7";
> >       status = "okay";
> >  };
> >
> > @@ -167,7 +167,7 @@ &seville_port6 {
> >       managed = "in-band-status";
> >       phy-handle = <&phy_qsgmii_6>;
> >       phy-mode = "qsgmii";
> > -     label = "ETH11";
> > +     label = "ETH9";
> >       status = "okay";
> >  };
> >
> > --
> > 2.32.0
> >
Vladimir Oltean Dec. 31, 2021, 12:52 p.m. UTC | #2
On Thu, Dec 30, 2021 at 04:24:38PM +0300, Maxim Kiselev wrote:
> Yes, I have T1040RDB ver.b (without SFP) and my front panel looks like this.
> 
>  +---------------------------------------------------------------------+
>  |                    NO SFP                                           |
>  |  +-------+-------+   |           +-------+-------+-------+-------+  |
>  |  | UART0 |  ETH1 |   |           |  ETH4 |  ETH6 |  ETH8 | ETH10 |  |
>  |  +-------+-------+  \|/  +-------+-------+-------+-------+-------+  |
>  |  | UART1 |  ETH0 |       |  ETH2 |  ETH3 |  ETH5 |  ETH7 | ETH9  |  |
>  +--+-------+-------+-------+-------+-------+-------+-------+-------+--+
> 
> Same as this pic
> https://habrastorage.org/files/433/d0f/057/433d0f05784f42b6acf9bb777970b1e9.jpg

I am not yet sure how to solve this. I don't really know what revision
my board is. I didn't know that there are multiple revisions that are
different in this regard, either. (one would expect that a Freescale/NXP
employee like me should know better, no?)
The reason why I'm not sure at all is because the SFP cage on my PCB
isn't populated either, yet the front panel is carved out for it.
See the attached picture. Do I have a rev B board mounted in a different
chassis (although it says T1040RDB)? Was there a board revision with an
actual SFP cage populated? I don't know, and I cannot really ask around
right now, since most everybody is on holiday. In the schematics for the
board rev B that I have, it says that the SFP cage should have been
populated, so this is strange (although it also says "T2081 ONLY!").
Maxim Kiselev Jan. 10, 2022, 7:40 a.m. UTC | #3
Here are photos of my boards.
Vladimir Oltean Jan. 11, 2022, 1:13 p.m. UTC | #4
Hi Maxim,

On Mon, Jan 10, 2022 at 07:40:38AM +0000, Maxim Kiselev wrote:
> Here are photos of my boards.

Your patch is OK to change t1040rdb.dts, but please preserve the existing
port mappings in a new arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts file.

You will also need to modify the /model and /compatible nodes of the new
device tree for Rev A, something like "fsl,T1040RDB-REV-A". Take a look
at arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3-rev-a.dts to see
an example of what I'd like to be done.

Thanks.
diff mbox series

Patch

diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb.dts b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
index af0c8a6f56138..b6733e7e65805 100644
--- a/arch/powerpc/boot/dts/fsl/t1040rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1040rdb.dts
@@ -119,7 +119,7 @@  &seville_port0 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_0>;
 	phy-mode = "qsgmii";
-	label = "ETH5";
+	label = "ETH3";
 	status = "okay";
 };
 
@@ -135,7 +135,7 @@  &seville_port2 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_2>;
 	phy-mode = "qsgmii";
-	label = "ETH7";
+	label = "ETH5";
 	status = "okay";
 };
 
@@ -151,7 +151,7 @@  &seville_port4 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_4>;
 	phy-mode = "qsgmii";
-	label = "ETH9";
+	label = "ETH7";
 	status = "okay";
 };
 
@@ -167,7 +167,7 @@  &seville_port6 {
 	managed = "in-band-status";
 	phy-handle = <&phy_qsgmii_6>;
 	phy-mode = "qsgmii";
-	label = "ETH11";
+	label = "ETH9";
 	status = "okay";
 };