1 files changed, 265 insertions, 2 deletions

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 00d0524fef13..f7bb8c90537c 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -277,6 +277,7 @@ unsigned long netxen_decode_crb_addr(unsigned long addr)
 
 static long rom_max_timeout = 10000;
 static long rom_lock_timeout = 1000000;
+static long rom_write_timeout = 700;
 
 static inline int rom_lock(struct netxen_adapter *adapter)
 {
@@ -405,7 +406,7 @@ do_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp)
 {
         netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ADDRESS, addr);
         netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ABYTE_CNT, 3);
-        udelay(100);            /* prevent bursting on CRB */
+        udelay(70);             /* prevent bursting on CRB */
         netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_DUMMY_BYTE_CNT, 0);
         netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_INSTR_OPCODE, 0xb);
         if (netxen_wait_rom_done(adapter)) {
@@ -414,13 +415,46 @@ do_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp)
         }
         /* reset abyte_cnt and dummy_byte_cnt */
         netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ABYTE_CNT, 0);
-        udelay(100);            /* prevent bursting on CRB */
+        udelay(70);             /* prevent bursting on CRB */
         netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_DUMMY_BYTE_CNT, 0);
 
         *valp = netxen_nic_reg_read(adapter, NETXEN_ROMUSB_ROM_RDATA);
         return 0;
 }
 
+static inline int 
+do_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
+                        u8 *bytes, size_t size)
+{
+        int addridx;
+        int ret = 0;
+
+        for (addridx = addr; addridx < (addr + size); addridx += 4) {
+                ret = do_rom_fast_read(adapter, addridx, (int *)bytes);
+                if (ret != 0)
+                        break;
+                bytes += 4;
+        }
+
+        return ret;
+}
+
+int
+netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr, 
+                                u8 *bytes, size_t size)
+{
+        int ret;
+
+        ret = rom_lock(adapter);
+        if (ret < 0)
+                return ret;
+
+        ret = do_rom_fast_read_words(adapter, addr, bytes, size);
+
+        netxen_rom_unlock(adapter);
+        return ret;
+}
+
 int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp)
 {
         int ret;
@@ -444,6 +478,152 @@ int netxen_rom_fast_write(struct netxen_adapter *adapter, int addr, int data)
         netxen_rom_unlock(adapter);
         return ret;
 }
+
+static inline int do_rom_fast_write_words(struct netxen_adapter *adapter, 
+                                                int addr, u8 *bytes, size_t size)
+{
+        int addridx = addr;
+        int ret = 0;
+
+        while (addridx < (addr + size)) {
+                int last_attempt = 0;
+                int timeout = 0;
+                int data;
+
+                data = *(u32*)bytes;
+
+                ret = do_rom_fast_write(adapter, addridx, data);
+                if (ret < 0)
+                        return ret;
+                        
+                while(1) {
+                        int data1;
+
+                        do_rom_fast_read(adapter, addridx, &data1);
+                        if (data1 == data)
+                                break;
+
+                        if (timeout++ >= rom_write_timeout) {
+                                if (last_attempt++ < 4) {
+                                        ret = do_rom_fast_write(adapter, 
+                                                                addridx, data);
+                                        if (ret < 0)
+                                                return ret;
+                                }
+                                else {
+                                        printk(KERN_INFO "Data write did not "
+                                           "succeed at address 0x%x\n", addridx);
+                                        break;
+                                }
+                        }
+                }
+
+                bytes += 4;
+                addridx += 4;
+        }
+
+        return ret;
+}
+
+int netxen_rom_fast_write_words(struct netxen_adapter *adapter, int addr, 
+                                        u8 *bytes, size_t size)
+{
+        int ret = 0;
+
+        ret = rom_lock(adapter);
+        if (ret < 0)
+                return ret;
+
+        ret = do_rom_fast_write_words(adapter, addr, bytes, size);
+        netxen_rom_unlock(adapter);
+
+        return ret;
+}
+
+int netxen_rom_wrsr(struct netxen_adapter *adapter, int data)
+{
+        int ret;
+
+        ret = netxen_rom_wren(adapter);
+        if (ret < 0)
+                return ret;
+
+        netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_ROM_WDATA, data);
+        netxen_crb_writelit_adapter(adapter, 
+                                        NETXEN_ROMUSB_ROM_INSTR_OPCODE, 0x1);
+
+        ret = netxen_wait_rom_done(adapter);
+        if (ret < 0)
+                return ret;
+
+        return netxen_rom_wip_poll(adapter);
+}
+
+int netxen_rom_rdsr(struct netxen_adapter *adapter)
+{
+        int ret;
+
+        ret = rom_lock(adapter);
+        if (ret < 0)
+                return ret;
+
+        ret = netxen_do_rom_rdsr(adapter);
+        netxen_rom_unlock(adapter);
+        return ret;
+}
+
+int netxen_backup_crbinit(struct netxen_adapter *adapter)
+{
+        int ret = FLASH_SUCCESS;
+        int val;
+        char *buffer = kmalloc(FLASH_SECTOR_SIZE, GFP_KERNEL);
+
+        if (!buffer)
+                return -ENOMEM; 
+        /* unlock sector 63 */
+        val = netxen_rom_rdsr(adapter);
+        val = val & 0xe3;
+        ret = netxen_rom_wrsr(adapter, val);
+        if (ret != FLASH_SUCCESS)
+                goto out_kfree;
+
+        ret = netxen_rom_wip_poll(adapter);
+        if (ret != FLASH_SUCCESS)
+                goto out_kfree;
+
+        /* copy  sector 0 to sector 63 */
+        ret = netxen_rom_fast_read_words(adapter, CRBINIT_START, 
+                                                buffer, FLASH_SECTOR_SIZE);
+        if (ret != FLASH_SUCCESS)
+                goto out_kfree;
+
+        ret = netxen_rom_fast_write_words(adapter, FIXED_START, 
+                                                buffer, FLASH_SECTOR_SIZE);
+        if (ret != FLASH_SUCCESS)
+                goto out_kfree;
+
+        /* lock sector 63 */
+        val = netxen_rom_rdsr(adapter);
+        if (!(val & 0x8)) {
+                val |= (0x1 << 2);
+                /* lock sector 63 */
+                if (netxen_rom_wrsr(adapter, val) == 0) {
+                        ret = netxen_rom_wip_poll(adapter);
+                        if (ret != FLASH_SUCCESS)
+                                goto out_kfree;
+
+                        /* lock SR writes */
+                        ret = netxen_rom_wip_poll(adapter);
+                        if (ret != FLASH_SUCCESS)
+                                goto out_kfree;
+                }
+        }
+
+out_kfree:
+        kfree(buffer);
+        return ret;
+}
+
 int netxen_do_rom_se(struct netxen_adapter *adapter, int addr)
 {
         netxen_rom_wren(adapter);
@@ -458,6 +638,27 @@ int netxen_do_rom_se(struct netxen_adapter *adapter, int addr)
         return netxen_rom_wip_poll(adapter);
 }
 
+void check_erased_flash(struct netxen_adapter *adapter, int addr)
+{
+        int i;
+        int val;
+        int count = 0, erased_errors = 0;
+        int range;
+
+        range = (addr == USER_START) ? FIXED_START : addr + FLASH_SECTOR_SIZE;
+        
+        for (i = addr; i < range; i += 4) {
+                netxen_rom_fast_read(adapter, i, &val);
+                if (val != 0xffffffff)
+                        erased_errors++;
+                count++;
+        }
+
+        if (erased_errors)
+                printk(KERN_INFO "0x%x out of 0x%x words fail to be erased "
+                        "for sector address: %x\n", erased_errors, count, addr);
+}
+
 int netxen_rom_se(struct netxen_adapter *adapter, int addr)
 {
         int ret = 0;
@@ -466,6 +667,68 @@ int netxen_rom_se(struct netxen_adapter *adapter, int addr)
         }
         ret = netxen_do_rom_se(adapter, addr);
         netxen_rom_unlock(adapter);
+        msleep(30);
+        check_erased_flash(adapter, addr);
+
+        return ret;
+}
+
+int
+netxen_flash_erase_sections(struct netxen_adapter *adapter, int start, int end)
+{
+        int ret = FLASH_SUCCESS;
+        int i;
+
+        for (i = start; i < end; i++) {
+                ret = netxen_rom_se(adapter, i * FLASH_SECTOR_SIZE);
+                if (ret)
+                        break;
+                ret = netxen_rom_wip_poll(adapter);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return ret;
+}
+
+int
+netxen_flash_erase_secondary(struct netxen_adapter *adapter)
+{
+        int ret = FLASH_SUCCESS;
+        int start, end;
+
+        start = SECONDARY_START / FLASH_SECTOR_SIZE;
+        end   = USER_START / FLASH_SECTOR_SIZE;
+        ret = netxen_flash_erase_sections(adapter, start, end);
+
+        return ret;
+}
+
+int
+netxen_flash_erase_primary(struct netxen_adapter *adapter)
+{
+        int ret = FLASH_SUCCESS;
+        int start, end;
+
+        start = PRIMARY_START / FLASH_SECTOR_SIZE;
+        end   = SECONDARY_START / FLASH_SECTOR_SIZE;
+        ret = netxen_flash_erase_sections(adapter, start, end);
+
+        return ret;
+}
+
+int netxen_flash_unlock(struct netxen_adapter *adapter)
+{
+        int ret = 0;
+
+        ret = netxen_rom_wrsr(adapter, 0);
+        if (ret < 0)
+                return ret;
+
+        ret = netxen_rom_wren(adapter);
+        if (ret < 0)
+                return ret;
+
         return ret;
 }