Submitted as http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=3596/1 Some ethernet controllers have no built-in way of obtaining an appropriate Ethernet MAC address. Such controllers have to be initialised in a board-specific way, depending on how the allocated MAC is stored. The IOMega NAS100d stores the MAC address in the flash memory at a known offset. This patch enables the built-in ixp400 ethernet device driver to access and use that MAC address. Signed-off-by: John Bowler Signed-off-by: Rod Whitby PATCH FOLLOWS KernelVersion: 2.6.17 arch/arm/mach-ixp4xx/nas100d-setup.c | 64 +++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+) Index: linux-2.6.17/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== --- linux-2.6.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c +++ linux-2.6.17/arch/arm/mach-ixp4xx/nas100d-setup.c @@ -21,6 +21,10 @@ #include #include +#include +#include +#include + static struct flash_platform_data nas100d_flash_data = { .map_name = "cfi_probe", .width = 2, @@ -142,8 +146,68 @@ gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH); } +/* + * When the RedBoot config partition is added the MAC address is read from + * it. + */ +static struct sockaddr mac; + +static void nas100d_flash_add(struct mtd_info *mtd) { + if (strcmp(mtd->name, "RedBoot config") == 0) { + size_t retlen; + int err; + /* the mac addr is at a known offset */ + err = mtd->read(mtd, 0x0FD8, 6, &retlen, (u8 *) &mac.sa_data); + if (err != 0 || retlen != 6) + printk(KERN_ERR "nas100d: mac addr read failed\n"); + } +} + +/* + * Nothing to do on remove at present. + */ +static void nas100d_flash_remove(struct mtd_info *mtd) { +} + +static struct mtd_notifier nas100d_flash_notifier = { + .add = nas100d_flash_add, + .remove = nas100d_flash_remove, +}; + +static int nas100d_netdev_event(struct notifier_block *this, + unsigned long event, void *ptr) +{ + struct net_device *dev = ptr; + + /* identify the ixp4xx eth, port 1 */ + if (dev->dev_addr[1] != 0x02 || dev->dev_addr[2] != 0xB3 + || dev->dev_addr[5] != 0x01) + return NOTIFY_DONE; + + if (event == NETDEV_REGISTER && is_valid_ether_addr(mac.sa_data)) { + mac.sa_family = dev->type; + dev_set_mac_address(dev, &mac); + printk(KERN_INFO + "ixp400_eth: MAC address now set to %.2x:%.2x:%.2x:%.2x:%.2x:%.2x for port 0\n", + mac.sa_data[0], mac.sa_data[1], mac.sa_data[2], + mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]); + } + + return NOTIFY_DONE; +} + +static struct notifier_block nas100d_netdev_notifier = { + .notifier_call = nas100d_netdev_event, +}; + static void __init nas100d_init(void) { + /* The flash has an ethernet MAC embedded in it which we need, + * that is all this notifier does. + */ + register_mtd_user(&nas100d_flash_notifier); + register_netdevice_notifier(&nas100d_netdev_notifier); + ixp4xx_sys_init(); /* gpio 14 and 15 are _not_ clocks */