Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d53b48d5 authored by Seokmann Ju's avatar Seokmann Ju Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct bus-reset behaviour with recent ISPs. 



The short-circuit to skip the non-applicable 'full-login-lip'
process on 81xx ISPs was nested too deeply in the 'bus-reset'
routine, as the code in qla2x00_loop_reset() should skip the
whole enable_lip_full_login process.  The original code could
cause device tear-down due to the qla2x00_wait_for_loop_ready()
call taking a large amount of time.

Signed-off-by: default avatarSeokmann Ju <seokmann.ju@qlogic.com>
Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 45d7c46d

drivers/scsi/qla2xxx/qla_mbx.c

+0 −3
Original line number Diff line number Diff line
@@ -1864,9 +1864,6 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha) 
	mbx_cmd_t mc;

	mbx_cmd_t *mcp = &mc;



	if (IS_QLA81XX(vha->hw))

	    return QLA_SUCCESS;



	DEBUG11(printk("qla2x00_full_login_lip(%ld): entered.\n",

	    vha->host_no));

drivers/scsi/qla2xxx/qla_os.c

+2 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,8 @@ qla2x00_loop_reset(scsi_qla_host_t *vha) 
	struct fc_port *fcport;

	struct qla_hw_data *ha = vha->hw;



	if (ha->flags.enable_lip_full_login && !vha->vp_idx) {

	if (ha->flags.enable_lip_full_login && !vha->vp_idx &&

	    !IS_QLA81XX(ha)) {

		ret = qla2x00_full_login_lip(vha);

		if (ret != QLA_SUCCESS) {

			DEBUG2_3(printk("%s(%ld): failed: "