From 14067f26f5e37c3506fec0af7bbc09750fedcf47 Mon Sep 17 00:00:00 2001 From: Vikas Chaudhary Date: Thu, 20 Sep 2012 07:35:05 -0400 Subject: [PATCH] --- yaml --- r: 328931 b: refs/heads/master c: 39c95826018ed68216cb34a1f6eb8c6b302a24f4 h: refs/heads/master i: 328929: ef86ae97054a5a8c8f8607681e93e625f3c84486 328927: 73c4944f826bb12563034919678120bd8c423fb6 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_glbl.h | 1 + trunk/drivers/scsi/qla4xxx/ql4_nx.c | 2 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 15 +++++++++++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 76d4fa1c3847..771e27ec13f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8276190725aca00bcf8869493a5040d2eebbca31 +refs/heads/master: 39c95826018ed68216cb34a1f6eb8c6b302a24f4 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_glbl.h b/trunk/drivers/scsi/qla4xxx/ql4_glbl.h index eea04e011a48..0580f8048f63 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_glbl.h +++ b/trunk/drivers/scsi/qla4xxx/ql4_glbl.h @@ -256,6 +256,7 @@ void qla4_8xxx_get_minidump(struct scsi_qla_host *ha); int qla4_8xxx_mbx_intr_disable(struct scsi_qla_host *ha); int qla4_8xxx_mbx_intr_enable(struct scsi_qla_host *ha); int qla4_8xxx_set_param(struct scsi_qla_host *ha, int param); +int qla4_8xxx_update_idc_reg(struct scsi_qla_host *ha); extern int ql4xextended_error_logging; extern int ql4xdontresethba; diff --git a/trunk/drivers/scsi/qla4xxx/ql4_nx.c b/trunk/drivers/scsi/qla4xxx/ql4_nx.c index 9b67aadf9fd0..66f52d2b5cd4 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_nx.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_nx.c @@ -2833,7 +2833,7 @@ static int qla4_83xx_set_idc_ver(struct scsi_qla_host *ha) return rval; } -static int qla4_8xxx_update_idc_reg(struct scsi_qla_host *ha) +int qla4_8xxx_update_idc_reg(struct scsi_qla_host *ha) { uint32_t drv_active; int rval = QLA_SUCCESS; diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c index afaba52ff250..81b3038c385c 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_os.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_os.c @@ -6135,9 +6135,19 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha) ha->isp_ops->idc_lock(ha); qla4_8xxx_wr_direct(ha, QLA8XXX_CRB_DEV_STATE, QLA8XXX_DEV_COLD); - qla4_8xxx_wr_direct(ha, QLA8XXX_CRB_DRV_IDC_VERSION, - QLA82XX_IDC_VERSION); ha->isp_ops->idc_unlock(ha); + + rval = qla4_8xxx_update_idc_reg(ha); + if (rval == QLA_ERROR) { + ql4_printk(KERN_INFO, ha, "scsi%ld: %s: HW State: FAILED\n", + ha->host_no, __func__); + ha->isp_ops->idc_lock(ha); + qla4_8xxx_wr_direct(ha, QLA8XXX_CRB_DEV_STATE, + QLA8XXX_DEV_FAILED); + ha->isp_ops->idc_unlock(ha); + goto exit_error_recovery; + } + clear_bit(AF_FW_RECOVERY, &ha->flags); rval = qla4xxx_initialize_adapter(ha, RESET_ADAPTER); @@ -6195,6 +6205,7 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha) ha->isp_ops->idc_unlock(ha); } } +exit_error_recovery: clear_bit(DPC_RESET_ACTIVE, &ha->dpc_flags); return rval; }