Ethernet : read MAC address from EEPROM.

Change-Id: I22d9948a621cc2d25cec0c798fe450af8ad70001

Author: yupei_lin

drivers/misc/eeprom/at24.c

@@ -98,6 +98,8 @@ static unsigned write_timeout = 25;
 module_param(write_timeout, uint, 0);
 MODULE_PARM_DESC(write_timeout, "Time (in ms) to try writes (default 25)");
 
+static struct kobject *eeprom_kobj;
+
 #define AT24_SIZE_BYTELEN 5
 #define AT24_SIZE_FLAGS 8
 
@@ -296,6 +298,13 @@ static ssize_t at24_bin_read(struct file *filp, struct kobject *kobj,
 	return at24_read(at24, buf, off, count);
 }
 
+void at24_read_eeprom(char *buf, loff_t off, size_t count)
+{
+	struct at24_data *at24;
+
+	at24 = dev_get_drvdata(container_of(eeprom_kobj, struct device, kobj));
+	at24_read(at24, buf, off, count);
+}
 
 /*
  * Note that if the hardware write-protect pin is pulled high, the whole
@@ -637,6 +646,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	if (err)
 		goto err_clients;
 
+	eeprom_kobj = &client->dev.kobj;
 	i2c_set_clientdata(client, at24);
 
 	dev_info(&client->dev, "%zu byte %s EEPROM, %s, %u bytes/write\n",

drivers/net/ethernet/stmicro/stmmac/Makefile

@@ -2,7 +2,7 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac.o
 stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o	\
 	      chain_mode.o dwmac_lib.o dwmac1000_core.o dwmac1000_dma.o	\
 	      dwmac100_core.o dwmac100_dma.o enh_desc.o norm_desc.o	\
-	      mmc_core.o stmmac_hwtstamp.o stmmac_ptp.o $(stmmac-y)
+	      mmc_core.o stmmac_hwtstamp.o stmmac_ptp.o eth_mac_tinker.o $(stmmac-y)
 
 # Ordering matters. Generic driver must be last.
 obj-$(CONFIG_STMMAC_PLATFORM)	+= stmmac-platform.o

drivers/net/ethernet/stmicro/stmmac/eth_mac_tinker.c

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 ROCKCHIP, Inc.
+ * Author: roger_chen <cz@rock-chips.com>
+ *
+ * This program is the virtual flash device
+ * used to store bd_addr or MAC
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/miscdevice.h>
+#include <linux/fs.h>
+#include <linux/platform_device.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
+#include "eth_mac_tinker.h"
+#include <linux/platform_data/at24.h>
+
+#if 1
+#define DBG(x...)   printk("eth_mac:" x)
+#else
+#define DBG(x...)
+#endif
+
+#define VERSION "0.1"
+#define WLAN_MAC_FILE "/data/misc/wifi/wlan_mac"
+
+int eth_mac_eeprom(u8 *eth_mac)
+{
+	int i;
+	memset(eth_mac, 0, 6);
+	printk("Read the Ethernet MAC address from EEPROM:");
+	at24_read_eeprom(eth_mac, 0, 6);
+	for(i=0; i<5; i++)
+		printk("%2.2x:", eth_mac[i]);
+	printk("%2.2x\n", eth_mac[i]);
+
+	return 0;
+}

drivers/net/ethernet/stmicro/stmmac/eth_mac_tinker.h

@@ -0,0 +1,12 @@
+#ifndef _ETH_MAC_TINKER_H_
+#define _ETH_MAC_TINKER_H_
+/*
+ *  eth_mac/eth_mac.h
+ *
+ *  Copyright (C) 2001 Russell King.
+ *
+ *  This file is placed under the LGPL.
+ *
+ */
+int eth_mac_eeprom(u8 *eth_mac);
+#endif /* _ETH_MAC_TINKER_H_ */

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

@@ -54,6 +54,7 @@
 #include "dwmac-rk-tool.h"
 #include <linux/reset.h>
 #include <linux/of_mdio.h>
+#include "eth_mac_tinker.h"
 
 #define	STMMAC_ALIGN(x)		__ALIGN_KERNEL(x, SMP_CACHE_BYTES)
 
@@ -1643,17 +1644,14 @@ static int stmmac_get_hw_features(struct stmmac_priv *priv)
  */
 static void stmmac_check_ether_addr(struct stmmac_priv *priv)
 {
-	if (!is_valid_ether_addr(priv->dev->dev_addr)) {
-		priv->hw->mac->get_umac_addr(priv->hw,
-					     priv->dev->dev_addr, 0);
-		if (likely(priv->plat->get_eth_addr))
-			priv->plat->get_eth_addr(priv->plat->bsp_priv,
-				priv->dev->dev_addr);
-		if (!is_valid_ether_addr(priv->dev->dev_addr))
-			eth_hw_addr_random(priv->dev);
-		pr_info("%s: device MAC address %pM\n", priv->dev->name,
+	eth_mac_eeprom(priv->dev->dev_addr);
+	if (likely(priv->plat->get_eth_addr))
+		priv->plat->get_eth_addr(priv->plat->bsp_priv,
 			priv->dev->dev_addr);
-	}
+	if (!is_valid_ether_addr(priv->dev->dev_addr))
+		eth_hw_addr_random(priv->dev);
+	pr_info("%s: device MAC address %pM\n", priv->dev->name,
+		priv->dev->dev_addr);
 }
 
 /**

include/linux/platform_data/at24.h

@@ -52,4 +52,6 @@ struct at24_platform_data {
 	void		*context;
 };
 
+extern void at24_read_eeprom(char *buf, loff_t off, size_t count);
+
 #endif /* _LINUX_AT24_H */