Changeset 43074


Ignore:
Timestamp:
2014-10-26T18:58:53+01:00 (3 years ago)
Author:
blogic
Message:

mpc85xx: fix WAN/LAN-MAC for TP-LINK TL-WDR4900 v1

This works around a bootloader issue where every device
has the same lan/wan-mac 00:04:9f:ef:01:01 - with this patch
we read the macs from config-partition during initial network
setup. We have 9 valid macs stored in the partition, the
1st two are used for the radios, 3 and 4 are now used for WAN/LAN.

on an already setup / running device we can get the real macs with
. /lib/functions.sh
. /lib/functions/system.sh
echo "LAN = $(mtd_get_mac_binary config 338)"
echo "WAN = $(mtd_get_mac_binary config 344)"

see:
https://dev.archive.openwrt.org/ticket/14714.html

from the ticket / user klondike:
U-Boot passed this commit https://gitorious.org/0xlab-kernel/u-boot/commit/ecd1a09b81f2ed6e6ba7bd1d0bfb0cc3d0ea2ad0
http://u-boot.10912.n7.nabble.com/U-Boot-PATCH-mpc83xx-remove-hardcoded-network-addresses-from-config-files-td44372.html
I suppose to prevent this particular issue, but the WDR4900 may be using an old bootloader still affected.


I have been checking the contents of the dtb on the flash, this particular bit is quite revealing:

ethernet@b0000 {

#address-cells = <0x1>;
#size-cells = <0x1>;
device_type = "network";
model = "eTSEC";
compatible = "fsl,etsec2";
fsl,num_rx_queues = <0x8>;
fsl,num_tx_queues = <0x8>;
local-mac-address = [00 00 00 00 00 00];


interrupt-parent = <0x2>;
phy-handle = <0x3>;
phy-connection-type = "rgmii-id";
ptimer-handle = <0x4>;

queue-group@0 {

#address-cells = <0x1>;
#size-cells = <0x1>;
reg = <0xb0000 0x1000>;
rx-bit-map = <0xff>;
tx-bit-map = <0xff>;
interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;

};

};

I also have been checking the live device map to find this:

root@GHS-AP3:~# hexdump -C /proc/device-tree/soc@ffe00000/ethernet@b0000/local-mac-address
00000000 00 04 9f ef 01 01 |......|
00000006
root@GHS-AP3:~# hexdump -C /proc/device-tree/soc@ffe00000/ethernet@b1000/local-mac-address
*
root@GHS-AP3:~# hexdump -C /proc/device-tree/soc@ffe00000/ethernet@b2000/local-mac-address
*

My conclussion is that U-Boot most likely finds the device and (as no valid MAC-address is provided)
falls back to the default MAC provided by the old code, the kernel then receives thee modified
device map from U-Boot and assumes this is the correct MAC for the device despite it obviously isn't.

This can be seen at
target/linux/mpc85xx/patches-3.10/140-powerpc-85xx-tl-wdr4900-v1-support.patch

The enetaddr is filled up by using the device tree data by the process_boot_dtb
function and used by the platform_fixups function to set the eth0 address
(by calling dt_fixup_mac_address_by_alias("ethernet0", enetaddr); ).
But instead we should be used the device address which to my understanding is
provided in the mtd.

Signed-off-by: Bastian Bittorf <bittorf@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/mpc85xx/base-files/etc/uci-defaults/02_network

    r35733 r43074  
    11#!/bin/sh 
    2 # 
    3 # Copyright (C) 2013 OpenWrt.org 
    4 # 
    5  
    6 tplink_set_mac() 
    7 { 
    8         local cfg=$1 
    9         local offset=$2 
    10         local mac 
    11  
    12         . /lib/functions.sh 
    13  
    14         mac=$(mtd_get_mac_binary u-boot 326656) 
    15         mac=$(macaddr_add $mac $offset) 
    16  
    17         ucidef_set_interface_macaddr $cfg $mac 
    18 } 
    19  
     2# Copyright (C) 2014 OpenWrt.org 
    203 
    214[ -e /etc/config/network ] && exit 0 
     
    258. /lib/functions/uci-defaults.sh 
    269. /lib/mpc85xx.sh 
     10. /lib/functions.sh 
     11. /lib/functions/system.sh 
    2712 
    2813ucidef_set_interface_loopback 
     
    3621        ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5" 
    3722        ucidef_add_switch_vlan "switch0" "2" "0t 1" 
    38         tplink_set_mac lan -2 
    39         tplink_set_mac wan 1 
     23        ucidef_set_interface_macaddr lan "$(mtd_get_mac_binary config 338)" 
     24        ucidef_set_interface_macaddr wan "$(mtd_get_mac_binary config 344)" 
    4025        ;; 
    41  
    4226*) 
    4327        ucidef_set_interfaces_lan_wan "eth0" "eth1" 
Note: See TracChangeset for help on using the changeset viewer.