leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/macb: support reversed hw addr

Browse Source 
This is used on one AT91RM9200 board where a bootloader stores
the Ethernet address in the wrong order.

Support this on macb so address setting functions can be shared
with the at91_ether driver.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joachim Eastwood 2012-11-07 08:14:51 +00:00 committed by David S. Miller
parent 17b8bb3e20
commit d25e78aaf9
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/cadence/macb.c
View File

@ -111,22 +111,34 @@ static void __macb_set_hwaddr(struct macb *bp)
static void __init macb_get_hwaddr(struct macb *bp) static void __init macb_get_hwaddr(struct macb *bp)
{ {
struct macb_platform_data *pdata;
u32 bottom; u32 bottom;
u16 top; u16 top;
u8 addr[6]; u8 addr[6];
int i; int i;
pdata = bp->pdev->dev.platform_data;
/* Check all 4 address register for vaild address */ /* Check all 4 address register for vaild address */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
bottom = macb_or_gem_readl(bp, SA1B + i * 8); bottom = macb_or_gem_readl(bp, SA1B + i * 8);
top = macb_or_gem_readl(bp, SA1T + i * 8); top = macb_or_gem_readl(bp, SA1T + i * 8);
addr[0] = bottom & 0xff; if (pdata && pdata->rev_eth_addr) {
addr[1] = (bottom >> 8) & 0xff; addr[5] = bottom & 0xff;
addr[2] = (bottom >> 16) & 0xff; addr[4] = (bottom >> 8) & 0xff;
addr[3] = (bottom >> 24) & 0xff; addr[3] = (bottom >> 16) & 0xff;
addr[4] = top & 0xff; addr[2] = (bottom >> 24) & 0xff;
addr[5] = (top >> 8) & 0xff; addr[1] = top & 0xff;
addr[0] = (top & 0xff00) >> 8;
} else {
addr[0] = bottom & 0xff;
addr[1] = (bottom >> 8) & 0xff;
addr[2] = (bottom >> 16) & 0xff;
addr[3] = (bottom >> 24) & 0xff;
addr[4] = top & 0xff;
addr[5] = (top >> 8) & 0xff;
}
if (is_valid_ether_addr(addr)) { if (is_valid_ether_addr(addr)) {
memcpy(bp->dev->dev_addr, addr, sizeof(addr)); memcpy(bp->dev->dev_addr, addr, sizeof(addr));