From patchwork Wed Nov 7 18:14:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 197692 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D3B7F2C0156 for ; Thu, 8 Nov 2012 05:15:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753714Ab2KGSPT (ORCPT ); Wed, 7 Nov 2012 13:15:19 -0500 Received: from mail-lb0-f174.google.com ([209.85.217.174]:60048 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752043Ab2KGSPO (ORCPT ); Wed, 7 Nov 2012 13:15:14 -0500 Received: by mail-lb0-f174.google.com with SMTP id n3so1512078lbo.19 for ; Wed, 07 Nov 2012 10:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=73bDs3pA2+wd8AvnJkpOyk1CXSdTsOLdAKp/QWFN8e8=; b=kMWn24npQmPW1+XwAiKIByxmDzMpfk4fHG9NHJJIbmpnG0LsnVvNPhVz95TnisrfBQ 3aX4fK8lHqkueNBSJndkdwpF/JSPvdR7ppMTTin12Htj0TFMkALOUtbiKg6HzSO7bX77 nEO0+LikHKC8FzRg4Tl3kqrXEpfZYRGYeYS43m86vBbU8oyYXm/t1ovllrX3AyWftRP6 p7PAFi91XI3Rvjh1jShmSi5XMpRQpwhKjnzYy0a/y6fFyqaDqPIzXnDn+Y9b5bdh1t87 NKzblApRBliVJ+6JK0Mvn1rkA5eyZ1pB+bzpyi3jPkf2uG14dln6M/9vYDV4u5FIq4x2 ePBw== Received: by 10.152.124.111 with SMTP id mh15mr5048547lab.20.1352312112981; Wed, 07 Nov 2012 10:15:12 -0800 (PST) Received: from localhost.localdomain (57.90-149-223.nextgentel.com. [90.149.223.57]) by mx.google.com with ESMTPS id b4sm8383536lbi.0.2012.11.07.10.15.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 10:15:12 -0800 (PST) From: Joachim Eastwood To: nicolas.ferre@atmel.com, davem@davemloft.net Cc: plagnioj@jcrosoft.com, netdev@vger.kernel.org, Joachim Eastwood Subject: [PATCH 1/8] net/macb: check all address registers sets Date: Wed, 7 Nov 2012 19:14:50 +0100 Message-Id: <1352312097-31320-2-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1352312097-31320-1-git-send-email-manabian@gmail.com> References: <1352312097-31320-1-git-send-email-manabian@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The macb driver in u-boot uses the first register set while the at91_ether driver in u-boot uses the second register set. By checking all register set, like at91_ether does, this code can be shared between the drivers. This only changes behavior on macb if no vaild address is found in the first register set. Signed-off-by: Joachim Eastwood --- drivers/net/ethernet/cadence/macb.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 13c3c33..3b609be 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -114,23 +114,28 @@ static void __init macb_get_hwaddr(struct macb *bp) u32 bottom; u16 top; u8 addr[6]; + int i; - bottom = macb_or_gem_readl(bp, SA1B); - top = macb_or_gem_readl(bp, SA1T); - - 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(bp->dev->dev_addr, addr, sizeof(addr)); - } else { - netdev_info(bp->dev, "invalid hw address, using random\n"); - eth_hw_addr_random(bp->dev); + /* Check all 4 address register for vaild address */ + for (i = 0; i < 4; i++) { + bottom = macb_or_gem_readl(bp, SA1B + i * 8); + top = macb_or_gem_readl(bp, 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(bp->dev->dev_addr, addr, sizeof(addr)); + return; + } } + + netdev_info(bp->dev, "invalid hw address, using random\n"); + eth_hw_addr_random(bp->dev); } static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)