From patchwork Mon Dec 7 12:17:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 40465 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 5DD5EB6F10 for ; Mon, 7 Dec 2009 23:18:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756164AbZLGMSW (ORCPT ); Mon, 7 Dec 2009 07:18:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755772AbZLGMSW (ORCPT ); Mon, 7 Dec 2009 07:18:22 -0500 Received: from aeryn.fluff.org.uk ([87.194.8.8]:48534 "EHLO kira.home.fluff.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755554AbZLGMSV (ORCPT ); Mon, 7 Dec 2009 07:18:21 -0500 Received: from ben by kira.home.fluff.org with local (Exim 4.69) (envelope-from ) id 1NHcXr-0004Xr-Rx; Mon, 07 Dec 2009 12:18:27 +0000 Message-Id: <20091207121827.775344820@fluff.org.uk> User-Agent: quilt/0.48-1 Date: Mon, 07 Dec 2009 12:17:30 +0000 From: Ben Dooks To: netdev@vger.kernel.org Cc: linux@simtec.co.uk, doong.ping@micrel.com, tristram.ha@micrel.com Subject: [patch 3/9] KS8851: Add support for EEPROM MAC address References: <20091207121727.016092171@fluff.org.uk> Content-Disposition: inline; filename=ks8851-mac-from-eeprom.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support for reading the MAC address from the system registers if there is an EEPROM present. This involves caching the KS_CCR register for later use (will also be useful for ETHTOOL support) and adding a print to say that there is an EEPROM present. Signed-off-by: Ben Dooks --- --- drivers/net/ks8851.c | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/drivers/net/ks8851.c =================================================================== --- a/drivers/net/ks8851.c 2009-12-07 10:59:14.000000000 +0000 +++ b/drivers/net/ks8851.c 2009-12-07 10:59:24.000000000 +0000 @@ -76,6 +76,7 @@ union ks8851_tx_hdr { * @msg_enable: The message flags controlling driver output (see ethtool). * @fid: Incrementing frame id tag. * @rc_ier: Cached copy of KS_IER. + * @rc_ccr: Cached copy of KS_CCR. * @rc_rxqcr: Cached copy of KS_RXQCR. * * The @lock ensures that the chip is protected when certain operations are @@ -107,6 +108,7 @@ struct ks8851_net { u16 rc_ier; u16 rc_rxqcr; + u16 rc_ccr; struct mii_if_info mii; struct ks8851_rxctrl rxctrl; @@ -367,21 +369,47 @@ static int ks8851_write_mac_addr(struct } /** + * ks8851_read_mac_addr - read mac address from device registers + * @dev: The network device + * + * Update our copy of the KS8851 MAC address from the registers of @dev. +*/ +static void ks8851_read_mac_addr(struct net_device *dev) +{ + struct ks8851_net *ks = netdev_priv(dev); + int i; + + mutex_lock(&ks->lock); + + for (i = 0; i < ETH_ALEN; i++) + dev->dev_addr[i] = ks8851_rdreg8(ks, KS_MAR(i)); + + mutex_unlock(&ks->lock); +} + +/** * ks8851_init_mac - initialise the mac address * @ks: The device structure * * Get or create the initial mac address for the device and then set that - * into the station address register. Currently we assume that the device - * does not have a valid mac address in it, and so we use random_ether_addr() + * into the station address register. If there is an EEPROM present, then + * we try that. If no valid mac address is found we use random_ether_addr() * to create a new one. - * - * In future, the driver should check to see if the device has an EEPROM - * attached and whether that has a valid ethernet address in it. */ static void ks8851_init_mac(struct ks8851_net *ks) { struct net_device *dev = ks->netdev; + /* first, try reading what we've got already */ + if (ks->rc_ccr & CCR_EEPROM) { + ks8851_read_mac_addr(dev); + if (is_valid_ether_addr(dev->dev_addr)) + return; + + ks_err(ks, "invalid mac address read %pM\n", + dev->dev_addr); + } + random_ether_addr(dev->dev_addr); ks8851_write_mac_addr(dev); } @@ -1280,6 +1308,9 @@ static int __devinit ks8851_probe(struct goto err_id; } + /* cache the contents of the CCR register for EEPROM, etc. */ + ks->rc_ccr = ks8851_rdreg16(ks, KS_CCR); + ks8851_read_selftest(ks); ks8851_init_mac(ks); ks->tx_space = ks8851_rdreg16(ks, KS_TXMIR); @@ -1297,9 +1328,10 @@ static int __devinit ks8851_probe(struct goto err_netdev; } - dev_info(&spi->dev, "revision %d, MAC %pM, IRQ %d\n", + dev_info(&spi->dev, "revision %d, MAC %pM, IRQ %d, %s EEPROM\n", CIDER_REV_GET(ks8851_rdreg16(ks, KS_CIDER)), - ndev->dev_addr, ndev->irq); + ndev->dev_addr, ndev->irq, + ks->rc_ccr & CCR_EEPROM ? "has" : "no"); return 0;