mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/1] macb: add support to read the mac address from register
Date: Sun, 6 Oct 2013 13:36:25 +0200	[thread overview]
Message-ID: <20131006113625.GQ30088@pengutronix.de> (raw)
In-Reply-To: <1380793529-6141-1-git-send-email-plagnioj@jcrosoft.com>

On Thu, Oct 03, 2013 at 11:45:29AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> check the 4 mac address register and return at the first valid
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Applied, thanks

Sascha

> ---
>  drivers/net/macb.c | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index b1f544b..d8523ce 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -458,9 +458,31 @@ static int macb_phy_write(struct mii_bus *bus, int addr, int reg, u16 value)
>  static int macb_get_ethaddr(struct eth_device *edev, unsigned char *adr)
>  {
>  	struct macb_device *macb = edev->priv;
> +	u32 bottom;
> +	u16 top;
> +	u8 addr[6];
> +	int i;
>  
>  	dev_dbg(macb->dev, "%s\n", __func__);
>  
> +	/* Check all 4 address register for vaild address */
> +	for (i = 0; i < 4; i++) {
> +		bottom = macb_or_gem_readl(macb, SA1B + i * 8);
> +		top = macb_or_gem_readl(macb, SA1T + i * 8);
> +
> +		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)) {
> +			memcpy(adr, addr, sizeof(addr));
> +			return 0;
> +		}
> +	}
> +
>  	return -1;
>  }
>  
> -- 
> 1.8.4.rc3
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2013-10-06 11:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-03  9:45 Jean-Christophe PLAGNIOL-VILLARD
2013-10-06 11:36 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131006113625.GQ30088@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=plagnioj@jcrosoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox