parse mac address on RouterBOARDs

SVN-Revision: 11910

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c b/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
index 9c91fa3bbe00e62aecd26980bf7288c769ff7f65..07bec246ba8fb4317f6469ea0a894e6aa41732ca 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/platform.c
@@ -22,6 +22,8 @@
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/platform.h>
 
+static u8 ar71xx_mac_base[ETH_ALEN] __initdata;
+
 /*
  * OHCI (USB full speed host controller)
  */
@@ -232,6 +234,7 @@ void __init ar71xx_add_device_eth(unsigned int id, phy_interface_t phy_if_mode,
                default:
                        BUG();
                }
+               memcpy(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, ETH_ALEN);
                ar71xx_eth0_data.phy_if_mode = phy_if_mode;
                ar71xx_eth0_data.phy_mask = phy_mask;
                pdev = &ar71xx_eth0_device;
@@ -247,6 +250,8 @@ void __init ar71xx_add_device_eth(unsigned int id, phy_interface_t phy_if_mode,
                default:
                        BUG();
                }
+               memcpy(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, ETH_ALEN);
+               ar71xx_eth1_data.mac_addr[5] += id;
                ar71xx_eth1_data.phy_if_mode = phy_if_mode;
                ar71xx_eth1_data.phy_mask = phy_mask;
                pdev = &ar71xx_eth1_device;
@@ -286,6 +291,21 @@ void __init ar71xx_add_device_spi(struct ar71xx_spi_platform_data *pdata,
        platform_device_register(&ar71xx_spi_device);
 }
 
+void __init ar71xx_set_mac_base(char *mac_str)
+{
+       u8 tmp[ETH_ALEN];
+       int t;
+
+       t = sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+                       &tmp[0], &tmp[1], &tmp[2], &tmp[3], &tmp[4], &tmp[5]);
+
+       if (t == ETH_ALEN)
+               memcpy(ar71xx_mac_base, tmp, ETH_ALEN);
+       else
+               printk(KERN_DEBUG "AR71XX: failed to parse mac address "
+                               "\"%s\"\n", mac_str);
+}
+
 static int __init ar71xx_machine_setup(void)
 {
        ar71xx_print_cmdline();

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
index e21464fc18b033503615e7d5aa74d7b3a7d0dc0b..69425d50c01cd04b1a9a85a6af8bf4c690e67056 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c
@@ -18,15 +18,16 @@
 #include <asm/addrspace.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
+#include <asm/mach-ar71xx/platform.h>
 
 struct board_rec {
        char            *name;
        unsigned long   mach_type;
 };
 
-static int prom_argc __initdata;
-static char **prom_argv __initdata;
-static char **prom_envp __initdata;
+static int ar71xx_prom_argc __initdata;
+static char **ar71xx_prom_argv __initdata;
+static char **ar71xx_prom_envp __initdata;
 
 static struct board_rec boards[] __initdata = {
        {
@@ -41,30 +42,37 @@ static struct board_rec boards[] __initdata = {
        }
 };
 
-char *(*prom_getenv)(const char *envname) __initdata;
-
-static __init char *dummy_getenv(const char *envname)
+static __init void routerboot_printargs(void)
 {
-       return NULL;
+       int i;
+
+       for (i = 0; i < ar71xx_prom_argc; i++)
+               printk(KERN_DEBUG "prom: routerboot envp[%d]: %s\n",
+                               i, ar71xx_prom_argv[i]);
 }
 
-static void __init routerboot_printargs(void)
+static __init char *routerboot_getenv(const char *envname)
 {
+       int len = strlen(envname);
        int i;
 
-       for (i = 0; i < prom_argc; i++)
-               printk(KERN_DEBUG "prom: routerboot envp[%d]: %s\n",
-                               i, prom_envp[i]);
+       for (i = 0; i < ar71xx_prom_argc; i++) {
+               char *env = ar71xx_prom_argv[i];
+               if (strncmp(envname, env, len) == 0 && (env)[len] == '=')
+                       return env + len + 1;
+       }
+
+       return NULL;
 }
 
-static __init char *routerboot_getenv(const char *envname)
+static __init char *redboot_getenv(const char *envname)
 {
+       int len = strlen(envname);
        char **env;
-       int i = strlen(envname);
 
-       for (env = prom_envp; *env != NULL; env++)
-               if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
-                       return *env + i + 1;
+       for (env = ar71xx_prom_envp; *env != NULL; env++)
+               if (strncmp(envname, *env, len) == 0 && (*env)[len] == '=')
+                       return *env + len + 1;
 
        return NULL;
 }
@@ -82,28 +90,37 @@ static __init unsigned long find_board_byname(char *name)
 
 void __init prom_init(void)
 {
-       char *board;
+       char *board = NULL;
+       char *mac = NULL;
 
        printk(KERN_DEBUG "prom: fw_arg0=%08x, fw_arg1=%08x, "
                        "fw_arg2=%08x, fw_arg3=%08x\n",
                        (unsigned int)fw_arg0, (unsigned int)fw_arg1,
                        (unsigned int)fw_arg2, (unsigned int)fw_arg3);
 
-       prom_getenv = dummy_getenv;
-
-       if ((fw_arg0 == 7) && (fw_arg2 == 0)) {
-               prom_argc = fw_arg0;
-               prom_envp = (char **)fw_arg1;
-               prom_getenv = routerboot_getenv;
+       if ((fw_arg0 == 7) && (fw_arg2 == 0) && (fw_arg3 == 0)) {
+                /* assume RouterBOOT */
+               ar71xx_prom_argc = fw_arg0;
+               ar71xx_prom_argv = (char **)fw_arg1;
                routerboot_printargs();
+               board = routerboot_getenv("board");
+               mac = routerboot_getenv("kmac");
+       } else {
+               /* assume Redboot */
+               ar71xx_prom_argc = fw_arg0;
+               ar71xx_prom_argv = (char **)fw_arg1;
+               ar71xx_prom_envp = (char **)fw_arg2;
+               mac = redboot_getenv("ethaddr");
        }
 
-       board = prom_getenv("board");
        if (board)
                mips_machtype = find_board_byname(board);
        else
                mips_machtype = MACH_AR71XX_GENERIC;
 
+       if (mac)
+               ar71xx_set_mac_base(mac);
+
        ar71xx_print_cmdline();
 }
 

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index e22a7e6d3a1d09777cdadc832cf8ac7a92830810..247667dc8e9b786a3e3a0a47100011bcbdbd27fe 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/random.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
@@ -35,7 +36,7 @@
 #define ETH_FCS_LEN    4
 
 #define AG71XX_DRV_NAME                "ag71xx"
-#define AG71XX_DRV_VERSION     "0.3.9"
+#define AG71XX_DRV_VERSION     "0.3.10"
 
 #define AG71XX_NAPI_TX         1
 

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index d4eebda054ea796aa5a10e9ec81dc640dd93c410..065f6033ab0fddb1ecbc96e89154657e22be2946 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -692,13 +692,14 @@ static void ag71xx_set_multicast_list(struct net_device *dev)
 
 static int __init ag71xx_probe(struct platform_device *pdev)
 {
-       static u8 default_mac[ETH_ALEN] = {0x00, 0xba, 0xdb, 0xad, 0xba, 0xd0};
        struct net_device *dev;
        struct resource *res;
        struct ag71xx *ag;
+       struct ag71xx_platform_data *pdata;
        int err;
 
-       if (!pdev->dev.platform_data) {
+       pdata = pdev->dev.platform_data;
+       if (!pdata) {
                dev_err(&pdev->dev, "no platform data specified\n");
                err = -ENXIO;
                goto err_out;
@@ -765,8 +766,14 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 
        netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
 
-       memcpy(dev->dev_addr, default_mac, ETH_ALEN);
-       dev->dev_addr[5] += pdev->id & 0xff;
+       if (is_valid_ether_addr(pdata->mac_addr))
+               memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
+       else {
+               dev->dev_addr[0] = 0xde;
+               dev->dev_addr[1] = 0xad;
+               get_random_bytes(&dev->dev_addr[2], 3);
+               dev->dev_addr[5] = pdev->id & 0xff;
+       }
 
        err = register_netdev(dev);
        if (err) {

diff --git a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h
index 6c23340a8440a08ea4dea9c3dac12aa107547bf3..f24ff800b591cffeab5643b96d67be051639205c 100644 (file)
--- a/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h
+++ b/target/linux/ar71xx/files/include/asm-mips/mach-ar71xx/platform.h
@@ -12,6 +12,7 @@
 #ifndef __ASM_MACH_AR71XX_PLATFORM_H
 #define __ASM_MACH_AR71XX_PLATFORM_H
 
+#include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <linux/phy.h>
 #include <linux/spi/spi.h>
@@ -22,6 +23,7 @@ struct ag71xx_platform_data {
        u32             phy_mask;
        phy_interface_t phy_if_mode;
        u32             mii_if;
+       u8              mac_addr[ETH_ALEN];
 };
 
 struct ar71xx_spi_platform_data {
@@ -36,6 +38,8 @@ struct ar71xx_spi_platform_data {
 extern void ar71xx_add_device_spi(struct ar71xx_spi_platform_data *pdata,
                                struct spi_board_info const *info,
                                unsigned n) __init;
+
+extern void ar71xx_set_mac_base(char *mac_str) __init;
 extern void ar71xx_add_device_eth(unsigned int id, phy_interface_t phy_if_mode,
                                u32 phy_mask) __init;