mpc832x_rdb: fix swapped ethernet ids
Subsystems (2)
PATCH 1/1 mpc832x_rdb: fix swapped ethernet ids
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.
---
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(-)
arch/powerpc/boot/dts/mpc832x_rdb.dts +0 -0
@@ -18,8 +18,8 @@
#size-cells = <1>;
aliases {
- ethernet0 = &enet0;
- ethernet1 = &enet1;
+ ethernet0 = &enet1;
+ ethernet1 = &enet0;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;Signature · 1 line
1.5.4.3
Quoted 4 lines · Michael Barkowski
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 22 lines
arch/powerpc/boot/dts/mpc832x_rdb.dts +2
-2@@ -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
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Signature · 4 lines
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
Quoted 8 lines · David Gibson
Quoted 4 lines · Michael Barkowski
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.
Signature · 1 line
Michael
Quoted 7 lines · Michael Barkowski
Quoted 6 lines · David Gibson
Quoted 4 lines · Michael Barkowski
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.
Quoted 5 lines
Quoted 2 lines
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?
Signature · 4 lines
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
Quoted 7 lines · David Gibson
Quoted 6 lines · Michael Barkowski
Quoted 5 lines · David Gibson
Quoted 4 lines · Michael Barkowski
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.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
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?
Signature · 1 line
Michael
Quoted 13 lines · Michael Barkowski
Quoted 12 lines · David Gibson
Quoted 10 lines · Michael Barkowski
Quoted 7 lines · David Gibson
Quoted 4 lines · Michael Barkowski
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.
Quoted 7 lines
Quoted 3 lines
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).
Signature · 4 lines
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
Quoted 16 lines · David Gibson
Quoted 15 lines · Michael Barkowski
Quoted 14 lines · David Gibson
Quoted 10 lines · Michael Barkowski
Quoted 7 lines · David Gibson
Quoted 4 lines · Michael Barkowski
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?
Quoted 9 lines
Quoted 4 lines
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,
Signature · 1 line
Michael
Kumar Gala
AppliedQuoted 16 lines · Michael Barkowski
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 <[email protected]>Acked-by Kim Phillips <[email protected]>---
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 |
Quoted 2 lines
arch/powerpc/boot/dts/mpc832x_rdb.dts| 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)
applied to merge.
- k