UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] qla2xxx: Add ISPFX00 specific bus reset routine. 

Signed-off-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Armen Baloyan 2013-08-27 01:37:33 -04:00 committed by James Bottomley
parent e601d778d5
commit 5854771e31
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/qla2xxx/qla_dbg.c
View File

@ -38,7 +38,7 @@
* | | | 0x70ad-0x70ae, | * | | | 0x70ad-0x70ae, |
* | | | 0x70d1-0x70da, | * | | | 0x70d1-0x70da, |
* | | | 0x7047,0x703b | * | | | 0x7047,0x703b |
* | Task Management | 0x803c | 0x8025-0x8026 | * | Task Management | 0x803d | 0x8025-0x8026 |
* | | | 0x800b,0x8039 | * | | | 0x800b,0x8039 |
* | AER/EEH | 0x9011 | | * | AER/EEH | 0x9011 | |
* | Virtual Port | 0xa007 | | * | Virtual Port | 0xa007 | |

1
drivers/scsi/qla2xxx/qla_gbl.h
View File

@ -605,6 +605,7 @@ extern void qlafx00_abort_iocb(srb_t *, struct abort_iocb_entry_fx00 *);
extern void qlafx00_fxdisc_iocb(srb_t *, struct fxdisc_entry_fx00 *); extern void qlafx00_fxdisc_iocb(srb_t *, struct fxdisc_entry_fx00 *);
extern void qlafx00_timer_routine(scsi_qla_host_t *); extern void qlafx00_timer_routine(scsi_qla_host_t *);
extern int qlafx00_rescan_isp(scsi_qla_host_t *); extern int qlafx00_rescan_isp(scsi_qla_host_t *);
extern int qlafx00_loop_reset(scsi_qla_host_t *vha);
/* qla82xx related functions */ /* qla82xx related functions */

23
drivers/scsi/qla2xxx/qla_mr.c
View File

@ -775,6 +775,29 @@ qlafx00_lun_reset(fc_port_t *fcport, unsigned int l, int tag)
return qlafx00_async_tm_cmd(fcport, TCF_LUN_RESET, l, tag); return qlafx00_async_tm_cmd(fcport, TCF_LUN_RESET, l, tag);
} }
int
qlafx00_loop_reset(scsi_qla_host_t *vha)
{
int ret;
struct fc_port *fcport;
struct qla_hw_data *ha = vha->hw;
if (ql2xtargetreset) {
list_for_each_entry(fcport, &vha->vp_fcports, list) {
if (fcport->port_type != FCT_TARGET)
continue;
ret = ha->isp_ops->target_reset(fcport, 0, 0);
if (ret != QLA_SUCCESS) {
ql_dbg(ql_dbg_taskm, vha, 0x803d,
"Bus Reset failed: Reset=%d "
"d_id=%x.\n", ret, fcport->d_id.b24);
}
}
}
return QLA_SUCCESS;
}
int int
qlafx00_iospace_config(struct qla_hw_data *ha) qlafx00_iospace_config(struct qla_hw_data *ha)
{ {

8
drivers/scsi/qla2xxx/qla_os.c
View File

@ -1303,6 +1303,10 @@ qla2x00_loop_reset(scsi_qla_host_t *vha)
struct fc_port *fcport; struct fc_port *fcport;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
if (IS_QLAFX00(ha)) {
return qlafx00_loop_reset(vha);
}
if (ql2xtargetreset == 1 && ha->flags.enable_target_reset) { if (ql2xtargetreset == 1 && ha->flags.enable_target_reset) {
list_for_each_entry(fcport, &vha->vp_fcports, list) { list_for_each_entry(fcport, &vha->vp_fcports, list) {
if (fcport->port_type != FCT_TARGET) if (fcport->port_type != FCT_TARGET)
@ -1311,14 +1315,12 @@ qla2x00_loop_reset(scsi_qla_host_t *vha)
ret = ha->isp_ops->target_reset(fcport, 0, 0); ret = ha->isp_ops->target_reset(fcport, 0, 0);
if (ret != QLA_SUCCESS) { if (ret != QLA_SUCCESS) {
ql_dbg(ql_dbg_taskm, vha, 0x802c, ql_dbg(ql_dbg_taskm, vha, 0x802c,
"Bus Reset failed: Target Reset=%d " "Bus Reset failed: Reset=%d "
"d_id=%x.\n", ret, fcport->d_id.b24); "d_id=%x.\n", ret, fcport->d_id.b24);
} }
} }
} }
if (IS_QLAFX00(ha))
return QLA_SUCCESS;
if (ha->flags.enable_lip_full_login && !IS_CNA_CAPABLE(ha)) { if (ha->flags.enable_lip_full_login && !IS_CNA_CAPABLE(ha)) {
atomic_set(&vha->loop_state, LOOP_DOWN); atomic_set(&vha->loop_state, LOOP_DOWN);