From patchwork Tue Jan 4 09:24:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 77438 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 0C26BB70D4 for ; Tue, 4 Jan 2011 20:24:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752131Ab1ADJXZ (ORCPT ); Tue, 4 Jan 2011 04:23:25 -0500 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:9487 "EHLO VA3EHSOBE008.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750853Ab1ADJXE (ORCPT ); Tue, 4 Jan 2011 04:23:04 -0500 Received: from mail123-va3-R.bigfish.com (10.7.14.245) by VA3EHSOBE008.bigfish.com (10.7.40.28) with Microsoft SMTP Server id 14.1.225.8; Tue, 4 Jan 2011 09:23:03 +0000 Received: from mail123-va3 (localhost.localdomain [127.0.0.1]) by mail123-va3-R.bigfish.com (Postfix) with ESMTP id B434DD7833B; Tue, 4 Jan 2011 09:23:03 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzbb2cK853kzz1202hzz8275bhz2dh2a8h668h63h) X-Spam-TCS-SCL: 2:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:az33egw01.freescale.net; RD:az33egw01.freescale.net; EFVD:NLI Received: from mail123-va3 (localhost.localdomain [127.0.0.1]) by mail123-va3 (MessageSwitch) id 1294132983401919_16010; Tue, 4 Jan 2011 09:23:03 +0000 (UTC) Received: from VA3EHSMHS015.bigfish.com (unknown [10.7.14.238]) by mail123-va3.bigfish.com (Postfix) with ESMTP id 5BE5C110053; Tue, 4 Jan 2011 09:23:03 +0000 (UTC) Received: from az33egw01.freescale.net (192.88.158.102) by VA3EHSMHS015.bigfish.com (10.7.99.25) with Microsoft SMTP Server (TLS) id 14.1.225.8; Tue, 4 Jan 2011 09:22:59 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw01.freescale.net (8.14.3/8.14.3) with ESMTP id p049Mw4p029979; Tue, 4 Jan 2011 02:22:58 -0700 (MST) Received: from ubuntu.ap.freescale.net (ubuntu-010192242196.ap.freescale.net [10.192.242.196]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p049Md8l004104; Tue, 4 Jan 2011 03:22:53 -0600 (CST) From: Shawn Guo To: , , , , , , , , , , , , , Subject: [PATCH v2 03/10] net/fec: add mac field into platform data and consolidate fec_get_mac Date: Tue, 4 Jan 2011 17:24:09 +0800 Message-ID: <1294133056-21195-4-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294133056-21195-1-git-send-email-shawn.guo@freescale.com> References: <1294133056-21195-1-git-send-email-shawn.guo@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add mac field into fec_platform_data and consolidate function fec_get_mac to get mac address in following order. 1) kernel command line fec_mac=xx:xx:xx... 2) from flash in case of CONFIG_M5272 or fec_platform_data mac field for others, which typically have mac stored in fuse 3) fec mac address registers set by bootloader Signed-off-by: Shawn Guo --- drivers/net/fec.c | 90 ++++++++++++++++++++++++++++---------------------- include/linux/fec.h | 2 + 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 47f6b3b..cd59814 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -59,15 +59,9 @@ #define FEC_ALIGNMENT 0x3 #endif -/* - * Define the fixed address of the FEC hardware. - */ -#if defined(CONFIG_M5272) - -static unsigned char fec_mac_default[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +static unsigned char fec_mac_default[ETH_ALEN]; +#if defined(CONFIG_M5272) /* * Some hardware gets it MAC address out of local flash memory. * if this is non-zero then assume it is the address to get MAC from. @@ -537,27 +531,40 @@ rx_processing_done: } /* ------------------------------------------------------------------------- */ -#ifdef CONFIG_M5272 static void __inline__ fec_get_mac(struct net_device *dev) { struct fec_enet_private *fep = netdev_priv(dev); + struct fec_platform_data *pdata = fep->pdev->dev.platform_data; unsigned char *iap, tmpaddr[ETH_ALEN]; - if (FEC_FLASHMAC) { - /* - * Get MAC address from FLASH. - * If it is all 1's or 0's, use the default. - */ - iap = (unsigned char *)FEC_FLASHMAC; - if ((iap[0] == 0) && (iap[1] == 0) && (iap[2] == 0) && - (iap[3] == 0) && (iap[4] == 0) && (iap[5] == 0)) - iap = fec_mac_default; - if ((iap[0] == 0xff) && (iap[1] == 0xff) && (iap[2] == 0xff) && - (iap[3] == 0xff) && (iap[4] == 0xff) && (iap[5] == 0xff)) - iap = fec_mac_default; - } else { - *((unsigned long *) &tmpaddr[0]) = readl(fep->hwp + FEC_ADDR_LOW); - *((unsigned short *) &tmpaddr[4]) = (readl(fep->hwp + FEC_ADDR_HIGH) >> 16); + /* + * try to get mac address in following order: + * + * 1) kernel command line fec_mac=xx:xx:xx... + */ + iap = fec_mac_default; + + /* + * 2) from flash or fuse (via platform data) + */ + if (!is_valid_ether_addr(iap)) { +#ifdef CONFIG_M5272 + if (FEC_FLASHMAC) + iap = (unsigned char *)FEC_FLASHMAC; +#else + if (pdata) + memcpy(iap, pdata->mac, ETH_ALEN); +#endif + } + + /* + * 3) FEC mac registers set by bootloader + */ + if (!is_valid_ether_addr(iap)) { + *((unsigned long *) &tmpaddr[0]) = + be32_to_cpu(readl(fep->hwp + FEC_ADDR_LOW)); + *((unsigned short *) &tmpaddr[4]) = + be16_to_cpu(readl(fep->hwp + FEC_ADDR_HIGH) >> 16); iap = &tmpaddr[0]; } @@ -567,7 +574,6 @@ static void __inline__ fec_get_mac(struct net_device *dev) if (iap == fec_mac_default) dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->pdev->id; } -#endif /* ------------------------------------------------------------------------- */ @@ -1063,6 +1069,24 @@ static const struct net_device_ops fec_netdev_ops = { .ndo_do_ioctl = fec_enet_ioctl, }; +static int __init fec_mac_addr_setup(char *mac_addr) +{ + int i; + unsigned int tmp; + + for (i = 0; i < ETH_ALEN; i++) { + if (sscanf(mac_addr + 3*i, "%2x", &tmp) != 1) { + printk(KERN_WARNING "Malformed fec mac address\n"); + return 0; + } + fec_mac_default[i] = tmp; + } + + return 1; +} + +__setup("fec_mac=", fec_mac_addr_setup); + /* * XXX: We need to clean up on failure exits here. * @@ -1087,22 +1111,8 @@ static int fec_enet_init(struct net_device *dev) fep->hwp = (void __iomem *)dev->base_addr; fep->netdev = dev; - /* Set the Ethernet address */ -#ifdef CONFIG_M5272 + /* Get the Ethernet address */ fec_get_mac(dev); -#else - { - unsigned long l; - l = readl(fep->hwp + FEC_ADDR_LOW); - dev->dev_addr[0] = (unsigned char)((l & 0xFF000000) >> 24); - dev->dev_addr[1] = (unsigned char)((l & 0x00FF0000) >> 16); - dev->dev_addr[2] = (unsigned char)((l & 0x0000FF00) >> 8); - dev->dev_addr[3] = (unsigned char)((l & 0x000000FF) >> 0); - l = readl(fep->hwp + FEC_ADDR_HIGH); - dev->dev_addr[4] = (unsigned char)((l & 0xFF000000) >> 24); - dev->dev_addr[5] = (unsigned char)((l & 0x00FF0000) >> 16); - } -#endif /* Set receive and transmit descriptor base. */ fep->rx_bd_base = cbd_base; diff --git a/include/linux/fec.h b/include/linux/fec.h index 5d3523d..bf0c69f 100644 --- a/include/linux/fec.h +++ b/include/linux/fec.h @@ -1,6 +1,7 @@ /* include/linux/fec.h * * Copyright (c) 2009 Orex Computed Radiography + * Copyright (C) 2010 Freescale Semiconductor, Inc. * Baruch Siach * * Header file for the FEC platform data @@ -16,6 +17,7 @@ struct fec_platform_data { phy_interface_t phy; + unsigned char mac[ETH_ALEN]; }; #endif