mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
netxen: fix firmware init handshake
Make sure all functions run firmware init handshake. If PCI function 0 fails to initialize firmware, mark the state failed so that other functions on the same board bail out quickly instead of waiting 30s for firmware handshake. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
01542cd1bb
commit
96f2ebd2e1
2 changed files with 23 additions and 19 deletions
|
@ -944,28 +944,31 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)
|
|||
u32 val = 0;
|
||||
int retries = 60;
|
||||
|
||||
if (!pegtune_val) {
|
||||
do {
|
||||
val = NXRD32(adapter, CRB_CMDPEG_STATE);
|
||||
if (pegtune_val)
|
||||
return 0;
|
||||
|
||||
if (val == PHAN_INITIALIZE_COMPLETE ||
|
||||
val == PHAN_INITIALIZE_ACK)
|
||||
return 0;
|
||||
do {
|
||||
val = NXRD32(adapter, CRB_CMDPEG_STATE);
|
||||
|
||||
msleep(500);
|
||||
|
||||
} while (--retries);
|
||||
|
||||
if (!retries) {
|
||||
pegtune_val = NXRD32(adapter,
|
||||
NETXEN_ROMUSB_GLB_PEGTUNE_DONE);
|
||||
printk(KERN_WARNING "netxen_phantom_init: init failed, "
|
||||
"pegtune_val=%x\n", pegtune_val);
|
||||
return -1;
|
||||
switch (val) {
|
||||
case PHAN_INITIALIZE_COMPLETE:
|
||||
case PHAN_INITIALIZE_ACK:
|
||||
return 0;
|
||||
case PHAN_INITIALIZE_FAILED:
|
||||
goto out_err;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
msleep(500);
|
||||
|
||||
} while (--retries);
|
||||
|
||||
NXWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_FAILED);
|
||||
|
||||
out_err:
|
||||
dev_warn(&adapter->pdev->dev, "firmware init failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -705,7 +705,7 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw)
|
|||
first_driver = (adapter->ahw.pci_func == 0);
|
||||
|
||||
if (!first_driver)
|
||||
return 0;
|
||||
goto wait_init;
|
||||
|
||||
first_boot = NXRD32(adapter, NETXEN_CAM_RAM(0x1fc));
|
||||
|
||||
|
@ -752,6 +752,7 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw)
|
|||
| (_NETXEN_NIC_LINUX_SUBVERSION);
|
||||
NXWR32(adapter, CRB_DRIVER_VERSION, val);
|
||||
|
||||
wait_init:
|
||||
/* Handshake with the card before we register the devices. */
|
||||
err = netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
|
||||
if (err) {
|
||||
|
|
Loading…
Reference in a new issue