[PATCH] mpc832x_rdb: fix swapped ethernet ids

Subsystems: linux for powerpc (32-bit and 64-bit), the rest · Maintainers: Madhavan Srinivasan, Linus Torvalds

STALE6551d REVIEWED: 1 (0M)

Status: Reviewed.

1 review trailer.

8 messages, 3 authors, 2008-11-19 · open the first message on its own page

[PATCH] mpc832x_rdb: fix swapped ethernet ids

From: Michael Barkowski <hidden>
Date: 2008-11-13 15:18:39 

ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.

Signed-off-by: Michael Barkowski <redacted>
Acked-by: Kim Phillips <redacted>
---
Cheat sheet:
| *Nickname* | WAN port | LAN switch |
| *MAC address* | ethaddr | eth1addr |
| *U-Boot name* | FSL UEC0 | FSL UEC1 |
| *Linux name* | eth1 | eth0 |
| *Phy ID* | 4 | 0 |
| *QE Device* | UCC3@2200 | UCC2@3000 |

arch/powerpc/boot/dts/mpc832x_rdb.dts |    4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 226ff06..dea3091 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -18,8 +18,8 @@
	#size-cells = <1>;

	aliases {
-		ethernet0 = &enet0;
-		ethernet1 = &enet1;
+		ethernet0 = &enet1;
+		ethernet1 = &enet0;
		serial0 = &serial0;
		serial1 = &serial1;
		pci0 = &pci0;
-- 
1.5.4.3

Re: [PATCH] mpc832x_rdb: fix swapped ethernet ids

From: David Gibson <hidden>
Date: 2008-11-13 23:45:07 

On Thu, Nov 13, 2008 at 10:18:28AM -0500, Michael Barkowski wrote:
ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.
Um.. why is just swapping the aliases, rather than the enet labels the
right approach here?
quoted hunk
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 226ff06..dea3091 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -18,8 +18,8 @@
	#size-cells = <1>;

	aliases {
-		ethernet0 = &enet0;
-		ethernet1 = &enet1;
+		ethernet0 = &enet1;
+		ethernet1 = &enet0;
		serial0 = &serial0;
		serial1 = &serial1;
		pci0 = &pci0;


_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: [PATCH] mpc832x_rdb: fix swapped ethernet ids

From: Michael Barkowski <hidden>
Date: 2008-11-14 15:16:19 

David Gibson wrote:
On Thu, Nov 13, 2008 at 10:18:28AM -0500, Michael Barkowski wrote:
quoted
ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.
Um.. why is just swapping the aliases, rather than the enet labels the
right approach here?
Kim suggested it was better to localize the port ordering as a property of the board rather than that of the QE, and I agreed.

-- 
Michael

Re: [PATCH] mpc832x_rdb: fix swapped ethernet ids

From: David Gibson <hidden>
Date: 2008-11-15 02:26:37 

On Fri, Nov 14, 2008 at 10:16:19AM -0500, Michael Barkowski wrote:
David Gibson wrote:
quoted
On Thu, Nov 13, 2008 at 10:18:28AM -0500, Michael Barkowski wrote:
quoted
ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.
Um.. why is just swapping the aliases, rather than the enet labels the
right approach here?
Kim suggested it was better to localize the port ordering as a
property of the board rather than that of the QE, and I agreed.
And the enet0/enet1 names that appear in the labels come from the QE
documentation?

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: [PATCH] mpc832x_rdb: fix swapped ethernet ids

From: Michael Barkowski <hidden>
Date: 2008-11-17 16:28:52 

David Gibson wrote:
On Fri, Nov 14, 2008 at 10:16:19AM -0500, Michael Barkowski wrote:
quoted
David Gibson wrote:
quoted
On Thu, Nov 13, 2008 at 10:18:28AM -0500, Michael Barkowski wrote:
quoted
ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.
Um.. why is just swapping the aliases, rather than the enet labels the
right approach here?
Kim suggested it was better to localize the port ordering as a
property of the board rather than that of the QE, and I agreed.
And the enet0/enet1 names that appear in the labels come from the QE
documentation?
No.. but don't you think the UCC2, UCC3 names, which *do* come from the QE documentation, should match their labels in numeric ordering?
Aren't the aliases just machine-specific shortcuts for the bootloader?

-- 
Michael

Re: [PATCH] mpc832x_rdb: fix swapped ethernet ids

From: David Gibson <hidden>
Date: 2008-11-18 00:17:40 

On Mon, Nov 17, 2008 at 11:28:52AM -0500, Michael Barkowski wrote:
David Gibson wrote:
quoted
On Fri, Nov 14, 2008 at 10:16:19AM -0500, Michael Barkowski wrote:
quoted
David Gibson wrote:
quoted
On Thu, Nov 13, 2008 at 10:18:28AM -0500, Michael Barkowski wrote:
quoted
ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.
Um.. why is just swapping the aliases, rather than the enet labels the
right approach here?
Kim suggested it was better to localize the port ordering as a
property of the board rather than that of the QE, and I agreed.
And the enet0/enet1 names that appear in the labels come from the QE
documentation?
No.. but don't you think the UCC2, UCC3 names, which *do* come from
the QE documentation, should match their labels in numeric ordering?
Aren't the aliases just machine-specific shortcuts for the
bootloader?
Ok, that's reasonable (although personally I would have thought it
would make more sense for the labels to be based on the documentation
terms, so UCC2, UCC3 etc., as we do on 4xx).

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: [PATCH] mpc832x_rdb: fix swapped ethernet ids

From: Michael Barkowski <hidden>
Date: 2008-11-18 15:02:56 

David Gibson wrote:
On Mon, Nov 17, 2008 at 11:28:52AM -0500, Michael Barkowski wrote:
quoted
David Gibson wrote:
quoted
On Fri, Nov 14, 2008 at 10:16:19AM -0500, Michael Barkowski wrote:
quoted
David Gibson wrote:
quoted
On Thu, Nov 13, 2008 at 10:18:28AM -0500, Michael Barkowski wrote:
quoted
ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.
Um.. why is just swapping the aliases, rather than the enet labels the
right approach here?
Kim suggested it was better to localize the port ordering as a
property of the board rather than that of the QE, and I agreed.
And the enet0/enet1 names that appear in the labels come from the QE
documentation?
No.. but don't you think the UCC2, UCC3 names, which *do* come from
the QE documentation, should match their labels in numeric ordering?
Aren't the aliases just machine-specific shortcuts for the
bootloader?
Ok, that's reasonable (although personally I would have thought it
would make more sense for the labels to be based on the documentation
terms, so UCC2, UCC3 etc., as we do on 4xx).
Yeah, that would make sense to me too.  Although I guess that's a separate patch/issue, since the enet0/enet1 labelling is pretty common across 85xx/83xx.

thanks,

-- 
Michael

Re: [PATCH] mpc832x_rdb: fix swapped ethernet ids

From: Kumar Gala <hidden>
Date: 2008-11-19 21:12:22 

On Nov 13, 2008, at 9:18 AM, Michael Barkowski wrote:

ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.

Signed-off-by: Michael Barkowski <redacted>
Acked-by: Kim Phillips <redacted>
---
Cheat sheet:
| *Nickname* | WAN port | LAN switch |
| *MAC address* | ethaddr | eth1addr |
| *U-Boot name* | FSL UEC0 | FSL UEC1 |
| *Linux name* | eth1 | eth0 |
| *Phy ID* | 4 | 0 |
| *QE Device* | UCC3@2200 | UCC2@3000 |

arch/powerpc/boot/dts/mpc832x_rdb.dts |    4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
applied to merge.

- k
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help