Patchwork mpc832x_rdb: fix swapped ethernet ids

login
register
mail settings
Submitter Michael Barkowski
Date Nov. 13, 2008, 3:18 p.m.
Message ID <491C4544.7020707@freescale.com>
Download mbox | patch
Permalink /patch/8587/
State Accepted, archived
Delegated to: Kumar Gala
Headers show

Comments

Michael Barkowski - Nov. 13, 2008, 3:18 p.m.
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 <michael.barkowski@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
---
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(-)
David Gibson - Nov. 13, 2008, 11:45 p.m.
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?

> 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
>
Michael Barkowski - Nov. 14, 2008, 3:16 p.m.
David Gibson wrote:
> 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?

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.
David Gibson - Nov. 15, 2008, 2:26 a.m.
On Fri, Nov 14, 2008 at 10:16:19AM -0500, Michael Barkowski wrote:
> David Gibson wrote:
>> 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?
>
> 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?
Michael Barkowski - Nov. 17, 2008, 4:28 p.m.
David Gibson wrote:
> On Fri, Nov 14, 2008 at 10:16:19AM -0500, Michael Barkowski wrote:
>> David Gibson wrote:
>>> 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?
>> 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?
David Gibson - Nov. 18, 2008, 12:17 a.m.
On Mon, Nov 17, 2008 at 11:28:52AM -0500, Michael Barkowski wrote:
> David Gibson wrote:
>> On Fri, Nov 14, 2008 at 10:16:19AM -0500, Michael Barkowski wrote:
>>> David Gibson wrote:
>>>> 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?
>>> 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).
Michael Barkowski - Nov. 18, 2008, 3:02 p.m.
David Gibson wrote:
> On Mon, Nov 17, 2008 at 11:28:52AM -0500, Michael Barkowski wrote:
>> David Gibson wrote:
>>> On Fri, Nov 14, 2008 at 10:16:19AM -0500, Michael Barkowski wrote:
>>>> David Gibson wrote:
>>>>> 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?
>>>> 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,
Kumar Gala - Nov. 19, 2008, 9:10 p.m.
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 <michael.barkowski@freescale.com>
> Acked-by: Kim Phillips <kim.phillips@freescale.com>
> ---
> 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

Patch

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;