diff options
| author |   Dhananjay Phadke <dhananjay@netxen.com> | 2009-01-14 20:49:00 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-01-14 20:49:00 -0800 |
| commit | 27c915a4d843b90eb4065298969578d15e5e6ab0 (patch) | |
| tree | df1e34fb723aedfd851c24946437951528548938 /drivers/net/netxen/netxen_nic_hw.c | |
| parent | netxen: fix link speed reporting for some boards (diff) | |
| download | linux-dev-27c915a4d843b90eb4065298969578d15e5e6ab0.tar.xz linux-dev-27c915a4d843b90eb4065298969578d15e5e6ab0.zip | |
netxen: firmware init fix
o Fix order or rom register writes.
o Reduce udelays when writing rom registers.
This cuts the firmware init time by 40%.
o Do not reset core/memory clocks when reinitializing driver.
Firmware willl handle this when initialized.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 4276f7f82238..511db2ac57c9 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c @@ -939,7 +939,7 @@ int netxen_load_firmware(struct netxen_adapter *adapter) { int i; u32 data, size = 0; - u32 flashaddr = NETXEN_BOOTLD_START, memaddr = NETXEN_BOOTLD_START; + u32 flashaddr = NETXEN_BOOTLD_START; size = (NETXEN_IMAGE_START - NETXEN_BOOTLD_START)/4; @@ -951,10 +951,8 @@ int netxen_load_firmware(struct netxen_adapter *adapter) if (netxen_rom_fast_read(adapter, flashaddr, (int *)&data) != 0) return -EIO; - adapter->pci_mem_write(adapter, memaddr, &data, 4); + adapter->pci_mem_write(adapter, flashaddr, &data, 4); flashaddr += 4; - memaddr += 4; - cond_resched(); } msleep(1); |