Re: [PATCH 04/50] adi/blackfin: set addr_assign_type correctly if random

From: Bob Liu
Date: Wed Feb 08 2012 - 22:28:09 EST

Next message: Steven Rostedt: "Re: linux-next: Tree for Feb 2 (trace/events/sunrpc.h)"
Previous message: Daniel Santos: "compile out effectively dead code from kmem_cache_create"
In reply to: Danny Kukawka: "[PATCH 04/50] adi/blackfin: set addr_assign_type correctly if random"
Next in thread: Mike Frysinger: "Re: [PATCH 04/50] adi/blackfin: set addr_assign_type correctly if random"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Danny,

On Thu, Feb 9, 2012 at 5:10 AM, Danny Kukawka <danny.kukawka@xxxxxxxxx> wrote:
> Set the addr_assign_type for adi driver correctly to
> NET_ADDR_RANDOM if a random MAC address was generated.
> Reset the state to NET_ADDR_PERM as soon as the MAC get
> changed via .ndo_set_mac_address.
>
> Signed-off-by: Danny Kukawka <danny.kukawka@xxxxxxxxx>
> ---
> Âarch/blackfin/mach-bf518/boards/ezbrd.c Â Â Â| Â Â3 ++-
> Âarch/blackfin/mach-bf518/boards/tcm-bf518.c Â| Â Â3 ++-
> Âarch/blackfin/mach-bf527/boards/ad7160eval.c | Â Â3 ++-
> Âarch/blackfin/mach-bf527/boards/cm_bf527.c Â | Â Â3 ++-
> Âarch/blackfin/mach-bf527/boards/ezbrd.c Â Â Â| Â Â3 ++-
> Âarch/blackfin/mach-bf527/boards/ezkit.c Â Â Â| Â Â3 ++-
> Âarch/blackfin/mach-bf527/boards/tll6527m.c Â | Â Â3 ++-
> Âarch/blackfin/mach-bf537/boards/cm_bf537e.c Â| Â Â3 ++-
> Âarch/blackfin/mach-bf537/boards/cm_bf537u.c Â| Â Â3 ++-
> Âarch/blackfin/mach-bf537/boards/dnp5370.c Â Â| Â Â3 ++-
> Âarch/blackfin/mach-bf537/boards/pnav10.c Â Â | Â Â3 ++-
> Âarch/blackfin/mach-bf537/boards/stamp.c Â Â Â| Â Â3 ++-
> Âarch/blackfin/mach-bf537/boards/tcm_bf537.c Â| Â Â3 ++-
> Âdrivers/net/ethernet/adi/bfin_mac.c Â Â Â Â Â| Â 10 +++++++---
> Âdrivers/net/ethernet/adi/bfin_mac.h Â Â Â Â Â| Â Â2 +-

Would you please split this into two patches, one for arch/blackfin
and the other
for drivers/net.
This can make our maintain simpler and clearer.

> Â15 files changed, 34 insertions(+), 17 deletions(-)
>
> diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c
> index a2d96d3..a173957 100644
> --- a/arch/blackfin/mach-bf518/boards/ezbrd.c
> +++ b/arch/blackfin/mach-bf518/boards/ezbrd.c
> @@ -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;
> @@ -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);
> diff --git a/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
> index f271310..d3c763e 100644
> --- a/arch/blackfin/mach-bf518/boards/tcm-bf518.c
> +++ b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
> @@ -730,9 +730,10 @@ 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);
> diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c
> index c8d5d2b..fad7fea 100644
> --- a/arch/blackfin/mach-bf527/boards/ad7160eval.c
> +++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c
> @@ -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;
> @@ -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);
> diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
> index 7330607..5fb09ad 100644
> --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
> +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
> @@ -983,9 +983,10 @@ 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);
> diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
> index db3ecfc..17c6a24 100644
> --- a/arch/blackfin/mach-bf527/boards/ezbrd.c
> +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
> @@ -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;
> @@ -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);
> diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
> index dfdd8e6..89b0f6c 100644
> --- a/arch/blackfin/mach-bf527/boards/ezkit.c
> +++ b/arch/blackfin/mach-bf527/boards/ezkit.c
> @@ -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;
> @@ -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);
> diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c
> index 360e97f..d192c0a 100644
> --- a/arch/blackfin/mach-bf527/boards/tll6527m.c
> +++ b/arch/blackfin/mach-bf527/boards/tll6527m.c
> @@ -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;
> @@ -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);
> diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> index 0d4a2f6..618fd7d 100644
> --- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> +++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
> @@ -813,9 +813,10 @@ 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);
> diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> index f553698..48a7a23 100644
> --- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> +++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
> @@ -790,9 +790,10 @@ 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);
> diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
> index 11dadeb..6f77bf7 100644
> --- a/arch/blackfin/mach-bf537/boards/dnp5370.c
> +++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
> @@ -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);
> diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
> index 6fd8470..2a9cd61 100644
> --- a/arch/blackfin/mach-bf537/boards/pnav10.c
> +++ b/arch/blackfin/mach-bf537/boards/pnav10.c
> @@ -535,9 +535,10 @@ 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);
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> index 2221173..0b80725 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -2993,9 +2993,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);
> diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> index 9885176..02eb9d0 100644
> --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
> @@ -780,9 +780,10 @@ 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);
> diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c
> index d812a10..064a3a6 100644
> --- a/drivers/net/ethernet/adi/bfin_mac.c
> +++ b/drivers/net/ethernet/adi/bfin_mac.c
> @@ -621,6 +621,8 @@ static int bfin_mac_set_mac_address(struct net_device *dev, void *p)
> Â Â Â Âif (netif_running(dev))
> Â Â Â Â Â Â Â Âreturn -EBUSY;
> Â Â Â Âmemcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
> + Â Â Â if (dev->addr_assign_type & NET_ADDR_RANDOM)
> + Â Â Â Â Â Â Â dev->addr_assign_type ^= NET_ADDR_RANDOM;
> Â Â Â Âsetup_mac_addr(dev->dev_addr);
> Â Â Â Âreturn 0;
> Â}
> @@ -1496,12 +1498,14 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
> Â Â Â Â * Grab the MAC from the board somehow
> Â Â Â Â * this is done in the arch/blackfin/mach-bfxxx/boards/eth_mac.c
> Â Â Â Â */
> - Â Â Â if (!is_valid_ether_addr(ndev->dev_addr))
> - Â Â Â Â Â Â Â bfin_get_ether_addr(ndev->dev_addr);
> + Â Â Â if (!is_valid_ether_addr(ndev->dev_addr)) {
> + Â Â Â Â Â Â Â if (bfin_get_ether_addr(ndev->dev_addr))
> + Â Â Â Â Â Â Â Â Â Â Â ndev->addr_assign_type |= NET_ADDR_RANDOM;
> + Â Â Â }
>
> Â Â Â Â/* If still not valid, get a random one */
> Â Â Â Âif (!is_valid_ether_addr(ndev->dev_addr))
> - Â Â Â Â Â Â Â random_ether_addr(ndev->dev_addr);
> + Â Â Â Â Â Â Â dev_hw_addr_random(ndev, ndev->dev_addr);
>
> Â Â Â Âsetup_mac_addr(ndev->dev_addr);
>
> diff --git a/drivers/net/ethernet/adi/bfin_mac.h b/drivers/net/ethernet/adi/bfin_mac.h
> index f8559ac..960905c 100644
> --- a/drivers/net/ethernet/adi/bfin_mac.h
> +++ b/drivers/net/ethernet/adi/bfin_mac.h
> @@ -101,6 +101,6 @@ struct bfin_mac_local {
> Â#endif
> Â};
>
> -extern void bfin_get_ether_addr(char *addr);
> +extern int bfin_get_ether_addr(char *addr);
>
> Â#endif
> --
> 1.7.7.3
>

--
Thanks,
--Bob
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Steven Rostedt: "Re: linux-next: Tree for Feb 2 (trace/events/sunrpc.h)"
Previous message: Daniel Santos: "compile out effectively dead code from kmem_cache_create"
In reply to: Danny Kukawka: "[PATCH 04/50] adi/blackfin: set addr_assign_type correctly if random"
Next in thread: Mike Frysinger: "Re: [PATCH 04/50] adi/blackfin: set addr_assign_type correctly if random"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]