diff options
| author | Prasanna Mumbai <prasanna.mumbai@qlogic.com> | 2011-03-21 03:34:26 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-03-23 12:48:33 -0500 |
| commit | f9880e76fd15795b5917b20f54eeca764b0f3ccb (patch) | |
| tree | 1eca5131db426ddf6cbc06e29d4be8bf245d252e /drivers | |
| parent | 99b53bf50cc4711a3c82dfc704911ff738a41758 (diff) | |
| download | linux-stable-f9880e76fd15795b5917b20f54eeca764b0f3ccb.tar.gz linux-stable-f9880e76fd15795b5917b20f54eeca764b0f3ccb.tar.bz2 linux-stable-f9880e76fd15795b5917b20f54eeca764b0f3ccb.zip | |
[SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Prasanna Mumbai <prasanna.mumbai@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 967836ef5ab2..409b20d62ef5 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -1630,6 +1630,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev, uint8_t init_retry_count = 0; char buf[34]; struct qla4_8xxx_legacy_intr_set *nx_legacy_intr; + uint32_t dev_state; if (pci_enable_device(pdev)) return -1; @@ -1713,6 +1714,18 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev, status = qla4xxx_initialize_adapter(ha, REBUILD_DDB_LIST); while ((!test_bit(AF_ONLINE, &ha->flags)) && init_retry_count++ < MAX_INIT_RETRIES) { + + if (is_qla8022(ha)) { + qla4_8xxx_idc_lock(ha); + dev_state = qla4_8xxx_rd_32(ha, QLA82XX_CRB_DEV_STATE); + qla4_8xxx_idc_unlock(ha); + if (dev_state == QLA82XX_DEV_FAILED) { + ql4_printk(KERN_WARNING, ha, "%s: don't retry " + "initialize adapter. H/W is in failed state\n", + __func__); + break; + } + } DEBUG2(printk("scsi: %s: retrying adapter initialization " "(%d)\n", __func__, init_retry_count)); |