lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netxen: firmware download improvements

Browse Source 
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>
This commit is contained in:
Dhananjay Phadke
2009-03-02 16:02:17 +00:00
committed by David S. Miller
parent 1f434f6384
commit 567c6c4e2b
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/netxen/netxen_nic_hw.c
View File

@@ -1069,6 +1069,16 @@ netxen_validate_firmware(struct netxen_adapter *adapter, const char *fwname,
return -EINVAL; return -EINVAL;
} }
/* check if flashed firmware is newer */
if (netxen_rom_fast_read(adapter,
NX_FW_VERSION_OFFSET, (int *)&val))
return -EIO;
major = (__force u32)val & 0xff;
minor = ((__force u32)val >> 8) & 0xff;
build = (__force u32)val >> 16;
if (NETXEN_VERSION_CODE(major, minor, build) > ver)
return -EINVAL;
netxen_nic_reg_write(adapter, NETXEN_CAM_RAM(0x1fc), netxen_nic_reg_write(adapter, NETXEN_CAM_RAM(0x1fc),
NETXEN_BDINFO_MAGIC); NETXEN_BDINFO_MAGIC);
return 0; return 0;
@@ -1087,6 +1097,12 @@ int netxen_load_firmware(struct netxen_adapter *adapter)
goto request_fw; goto request_fw;
} }
if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
fw_name = NX_P3_CT_ROMIMAGE;
goto request_fw;
}
request_mn:
capability = 0; capability = 0;
netxen_rom_fast_read(adapter, netxen_rom_fast_read(adapter,
@@ -1100,15 +1116,12 @@ int netxen_load_firmware(struct netxen_adapter *adapter)
} }
} }
request_ct:
fw_name = NX_P3_CT_ROMIMAGE;
request_fw: request_fw:
rc = request_firmware(&fw, fw_name, &pdev->dev); rc = request_firmware(&fw, fw_name, &pdev->dev);
if (rc != 0) { if (rc != 0) {
if (fw_name == NX_P3_MN_ROMIMAGE) { if (fw_name == NX_P3_CT_ROMIMAGE) {
msleep(1); msleep(1);
goto request_ct; goto request_mn;
} }
fw = NULL; fw = NULL;
@@ -1119,9 +1132,9 @@ request_fw:
if (rc != 0) { if (rc != 0) {
release_firmware(fw); release_firmware(fw);
if (fw_name == NX_P3_MN_ROMIMAGE) { if (fw_name == NX_P3_CT_ROMIMAGE) {
msleep(1); msleep(1);
goto request_ct; goto request_mn;
} }
fw = NULL; fw = NULL;

7
drivers/net/netxen/netxen_nic_main.c
View File

@@ -676,16 +676,17 @@ netxen_start_firmware(struct netxen_adapter *adapter)
return err; return err;
} }
if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
netxen_set_port_mode(adapter);
if (first_boot != 0x55555555) { if (first_boot != 0x55555555) {
adapter->pci_write_normalize(adapter, adapter->pci_write_normalize(adapter,
CRB_CMDPEG_STATE, 0); CRB_CMDPEG_STATE, 0);
netxen_pinit_from_rom(adapter, 0); netxen_pinit_from_rom(adapter, 0);
msleep(1); msleep(1);
} }
netxen_nic_reg_write(adapter, CRB_DMA_SHIFT, 0x55555555); 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); netxen_load_firmware(adapter);
if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) { if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {