diff options
| author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-03-02 16:02:17 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-03 08:05:27 (GMT) |
| commit | 567c6c4e2b92f4b8632b043f9395b216b7e7c3ce (patch) | |
| tree | 20eda4904012401002d42e27abf555564adf12b8 /drivers/net/netxen/netxen_nic_main.c | |
| parent | 1f434f638457712732238329dfdf089eab25e5b3 (diff) | |
| download | linux-fsl-qoriq-567c6c4e2b92f4b8632b043f9395b216b7e7c3ce.tar.xz | |
netxen: firmware download improvements
o set port mode after resetting device.
o prefer cut-through firmware (doesn't require on-card memory).
o load flashed firmware if newer.
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_main.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 0ce7cf0..dfd66ea 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -676,16 +676,17 @@ netxen_start_firmware(struct netxen_adapter *adapter) return err; } - if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) - netxen_set_port_mode(adapter); - if (first_boot != 0x55555555) { adapter->pci_write_normalize(adapter, CRB_CMDPEG_STATE, 0); netxen_pinit_from_rom(adapter, 0); msleep(1); } + netxen_nic_reg_write(adapter, CRB_DMA_SHIFT, 0x55555555); + if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) + netxen_set_port_mode(adapter); + netxen_load_firmware(adapter); if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) { |