NetXen: Added ethtool support for user level tools.

NetXen: Added ethtool support for user level firmware management utilities.

Signed-off-by: Amit S. Kale <amitkale@netxen.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 81 insertions, 15 deletions

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index c381d77a7336..cc0efe213e01 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
 #include <linux/pci.h>
 #include <asm/io.h>
@@ -94,17 +95,7 @@ static const char netxen_nic_gstrings_test[][ETH_GSTRING_LEN] = {
 
 static int netxen_nic_get_eeprom_len(struct net_device *dev)
 {
-        struct netxen_port *port = netdev_priv(dev);
-        struct netxen_adapter *adapter = port->adapter;
-        int n;
-
-        if ((netxen_rom_fast_read(adapter, 0, &n) == 0)
-            && (n & NETXEN_ROM_ROUNDUP)) {
-                n &= ~NETXEN_ROM_ROUNDUP;
-                if (n < NETXEN_MAX_EEPROM_LEN)
-                        return n;
-        }
-        return 0;
+        return FLASH_TOTAL_SIZE;
 }
 
 static void
@@ -440,18 +431,92 @@ netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
         struct netxen_port *port = netdev_priv(dev);
         struct netxen_adapter *adapter = port->adapter;
         int offset;
+        int ret;
 
         if (eeprom->len == 0)
                 return -EINVAL;
 
         eeprom->magic = (port->pdev)->vendor | ((port->pdev)->device << 16);
-        for (offset = 0; offset < eeprom->len; offset++)
-                if (netxen_rom_fast_read
-                    (adapter, (8 * offset) + 8, (int *)eeprom->data) == -1)
-                        return -EIO;
+        offset = eeprom->offset;
+
+        ret = netxen_rom_fast_read_words(adapter, offset, bytes, 
+                                                eeprom->len);
+        if (ret < 0)
+                return ret;
+
         return 0;
 }
 
+static int
+netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
+                        u8 * bytes)
+{
+        struct netxen_port *port = netdev_priv(dev);
+        struct netxen_adapter *adapter = port->adapter;
+        int offset = eeprom->offset;
+        static int flash_start;
+        static int ready_to_flash;
+        int ret;
+
+        if (flash_start == 0) {
+                ret = netxen_flash_unlock(adapter);
+                if (ret < 0) {
+                        printk(KERN_ERR "%s: Flash unlock failed.\n",
+                                netxen_nic_driver_name);
+                        return ret;
+                }
+                printk(KERN_INFO "%s: flash unlocked. \n", 
+                        netxen_nic_driver_name);
+                ret = netxen_flash_erase_secondary(adapter);
+                if (ret != FLASH_SUCCESS) {
+                        printk(KERN_ERR "%s: Flash erase failed.\n", 
+                                netxen_nic_driver_name);
+                        return ret;
+                }
+                printk(KERN_INFO "%s: secondary flash erased successfully.\n", 
+                        netxen_nic_driver_name);
+                flash_start = 1;
+                return 0;
+        }
+
+        if (offset == BOOTLD_START) {
+                ret = netxen_flash_erase_primary(adapter);
+                if (ret != FLASH_SUCCESS) {
+                        printk(KERN_ERR "%s: Flash erase failed.\n", 
+                                netxen_nic_driver_name);
+                        return ret;
+                }
+
+                ret = netxen_rom_se(adapter, USER_START);
+                if (ret != FLASH_SUCCESS)
+                        return ret;
+                ret = netxen_rom_se(adapter, FIXED_START);
+                if (ret != FLASH_SUCCESS)
+                        return ret;
+
+                printk(KERN_INFO "%s: primary flash erased successfully\n", 
+                        netxen_nic_driver_name);
+
+                ret = netxen_backup_crbinit(adapter);
+                if (ret != FLASH_SUCCESS) {
+                        printk(KERN_ERR "%s: CRBinit backup failed.\n", 
+                                netxen_nic_driver_name);
+                        return ret;
+                }
+                printk(KERN_INFO "%s: CRBinit backup done.\n", 
+                        netxen_nic_driver_name);
+                ready_to_flash = 1;
+        }
+
+        if (!ready_to_flash) {
+                printk(KERN_ERR "%s: Invalid write sequence, returning...\n",
+                        netxen_nic_driver_name);
+                return -EINVAL;
+        }
+
+        return netxen_rom_fast_write_words(adapter, offset, bytes, eeprom->len);
+}
+
 static void
 netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
 {
@@ -721,6 +786,7 @@ struct ethtool_ops netxen_nic_ethtool_ops = {
         .get_link = netxen_nic_get_link,
         .get_eeprom_len = netxen_nic_get_eeprom_len,
         .get_eeprom = netxen_nic_get_eeprom,
+        .set_eeprom = netxen_nic_set_eeprom,
         .get_ringparam = netxen_nic_get_ringparam,
         .get_pauseparam = netxen_nic_get_pauseparam,
         .set_pauseparam = netxen_nic_set_pauseparam,