Skip to content

Commit

Permalink
arch/blackfin: don't generate random mac in bfin_get_ether_addr()
Browse files Browse the repository at this point in the history 
Changed bfin_get_ether_addr() to return a state and to
set no random mac address if the board don't provide one.

Let the caller of bfin_get_ether_addr() set a random mac
address if the return value is not 0.

v2: don't set random mac in bfin_get_ether_addr()

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
  • Loading branch information
Danny Kukawka authored and Bob Liu committed Mar 21, 2012
1 parent dd47ba1 commit 0eceb82
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 25 deletions.
3 changes: 2 additions & 1 deletion arch/blackfin/mach-bf518/boards/ezbrd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ void native_machine_restart(char *cmd)
bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
/* the MAC is stored in OTP memory page 0xDF */
u32 ret;
Expand All @@ -834,5 +834,6 @@ void bfin_get_ether_addr(char *addr)
for (ret = 0; ret < 6; ++ret)
addr[ret] = otp_mac_p[5 - ret];
}
return 0;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
5 changes: 2 additions & 3 deletions arch/blackfin/mach-bf518/boards/tcm-bf518.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +730,8 @@ void native_machine_restart(char *cmd)
bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
return 1;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
3 changes: 2 additions & 1 deletion arch/blackfin/mach-bf527/boards/ad7160eval.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ void native_machine_restart(char *cmd)
bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
/* the MAC is stored in OTP memory page 0xDF */
u32 ret;
Expand All @@ -859,5 +859,6 @@ void bfin_get_ether_addr(char *addr)
for (ret = 0; ret < 6; ++ret)
addr[ret] = otp_mac_p[5 - ret];
}
return 0;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
5 changes: 2 additions & 3 deletions arch/blackfin/mach-bf527/boards/cm_bf527.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,9 +983,8 @@ void native_machine_restart(char *cmd)
bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
return 1;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
3 changes: 2 additions & 1 deletion arch/blackfin/mach-bf527/boards/ezbrd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ void native_machine_restart(char *cmd)
bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
/* the MAC is stored in OTP memory page 0xDF */
u32 ret;
Expand All @@ -883,5 +883,6 @@ void bfin_get_ether_addr(char *addr)
for (ret = 0; ret < 6; ++ret)
addr[ret] = otp_mac_p[5 - ret];
}
return 0;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
3 changes: 2 additions & 1 deletion arch/blackfin/mach-bf527/boards/ezkit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ void native_machine_restart(char *cmd)
bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
/* the MAC is stored in OTP memory page 0xDF */
u32 ret;
Expand All @@ -1324,5 +1324,6 @@ void bfin_get_ether_addr(char *addr)
for (ret = 0; ret < 6; ++ret)
addr[ret] = otp_mac_p[5 - ret];
}
return 0;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
3 changes: 2 additions & 1 deletion arch/blackfin/mach-bf527/boards/tll6527m.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ void native_machine_restart(char *cmd)
bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
/* the MAC is stored in OTP memory page 0xDF */
u32 ret;
Expand All @@ -945,5 +945,6 @@ void bfin_get_ether_addr(char *addr)
for (ret = 0; ret < 6; ++ret)
addr[ret] = otp_mac_p[5 - ret];
}
return 0;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
5 changes: 2 additions & 3 deletions arch/blackfin/mach-bf537/boards/cm_bf537e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -813,9 +813,8 @@ void __init native_machine_early_platform_add_devices(void)
ARRAY_SIZE(cm_bf537e_early_devices));
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
return 1;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
5 changes: 2 additions & 3 deletions arch/blackfin/mach-bf537/boards/cm_bf537u.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -790,9 +790,8 @@ void __init native_machine_early_platform_add_devices(void)
ARRAY_SIZE(cm_bf537u_early_devices));
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
return 1;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
3 changes: 2 additions & 1 deletion arch/blackfin/mach-bf537/boards/dnp5370.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,10 @@ arch_initcall(dnp5370_init);
/*
* Currently the MAC address is saved in Flash by U-Boot
*/
void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
return 0;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
5 changes: 2 additions & 3 deletions arch/blackfin/mach-bf537/boards/pnav10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,8 @@ void __init native_machine_early_platform_add_devices(void)
ARRAY_SIZE(stamp_early_devices));
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
return 1;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
3 changes: 2 additions & 1 deletion arch/blackfin/mach-bf537/boards/stamp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3013,9 +3013,10 @@ void native_machine_restart(char *cmd)
* Currently the MAC address is saved in Flash by U-Boot
*/
#define FLASH_MAC 0x203f0000
void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
return 0;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
5 changes: 2 additions & 3 deletions arch/blackfin/mach-bf537/boards/tcm_bf537.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,9 +780,8 @@ void __init native_machine_early_platform_add_devices(void)
ARRAY_SIZE(cm_bf537_early_devices));
}

void bfin_get_ether_addr(char *addr)
int bfin_get_ether_addr(char *addr)
{
random_ether_addr(addr);
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
return 1;
}
EXPORT_SYMBOL(bfin_get_ether_addr);

0 comments on commit 0eceb82

Please sign in to comment.