mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
4e18d70247
This patchset is managed in https://github.com/beagleboard/kernel/tree/beagleboard-3.2 by Robert Nelson and myself. Tested on beagleboard-xM/Angstrom Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
From 9318b0759a699e6128817bead791603201e73d99 Mon Sep 17 00:00:00 2001
|
|
From: Robert Nelson <robertcnelson@gmail.com>
|
|
Date: Thu, 29 Sep 2011 11:36:22 -0500
|
|
Subject: [PATCH 03/14] ksz8851 read_mac_addr
|
|
|
|
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
|
|
---
|
|
drivers/net/ethernet/micrel/ks8851.c | 44 ++++++++++++++++++++++++++++-----
|
|
1 files changed, 37 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
|
|
index f56743a..da7cbea 100644
|
|
--- a/drivers/net/ethernet/micrel/ks8851.c
|
|
+++ b/drivers/net/ethernet/micrel/ks8851.c
|
|
@@ -367,21 +367,47 @@ static int ks8851_write_mac_addr(struct net_device *dev)
|
|
}
|
|
|
|
/**
|
|
+ * 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;
|
|
+
|
|
+ netdev_err(ks->netdev, "invalid mac address read %pM\n",
|
|
+ dev->dev_addr);
|
|
+ }
|
|
+
|
|
random_ether_addr(dev->dev_addr);
|
|
ks8851_write_mac_addr(dev);
|
|
}
|
|
@@ -1658,6 +1684,9 @@ static int __devinit ks8851_probe(struct spi_device *spi)
|
|
else
|
|
ks->eeprom_size = 0;
|
|
|
|
+ /* 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);
|
|
|
|
@@ -1674,9 +1703,10 @@ static int __devinit ks8851_probe(struct spi_device *spi)
|
|
goto err_netdev;
|
|
}
|
|
|
|
- netdev_info(ndev, "revision %d, MAC %pM, IRQ %d\n",
|
|
+ netdev_info(ndev, "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;
|
|
|
|
--
|
|
1.7.7.4
|
|
|