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

Commit 008dda66 authored May 15, 2012 by Chad Dupuis Committed by James Bottomley May 22, 2012

[SCSI] qla2xxx: Remove unneeded DPC wakeups from qla82xx_watchdog.



Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 24d9ee85

drivers/scsi/qla2xxx/qla_nx.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3352,13 +3352,11 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
	ql_log(ql_log_warn, vha, 0x6001,		ql_log(ql_log_warn, vha, 0x6001,
	"Adapter reset needed.\n");		"Adapter reset needed.\n");
	set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);		set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
	qla2xxx_wake_dpc(vha);
	} else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT &&		} else if (dev_state == QLA82XX_DEV_NEED_QUIESCENT &&
	!test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags)) {		!test_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags)) {
	ql_log(ql_log_warn, vha, 0x6002,		ql_log(ql_log_warn, vha, 0x6002,
	"Quiescent needed.\n");		"Quiescent needed.\n");
	set_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags);		set_bit(ISP_QUIESCE_NEEDED, &vha->dpc_flags);
	qla2xxx_wake_dpc(vha);
	} else {		} else {
	if (qla82xx_check_fw_alive(vha)) {		if (qla82xx_check_fw_alive(vha)) {
	ql_dbg(ql_dbg_timer, vha, 0x6011,		ql_dbg(ql_dbg_timer, vha, 0x6011,
	@@ -3398,7 +3396,6 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
	set_bit(ISP_ABORT_NEEDED,		set_bit(ISP_ABORT_NEEDED,
	&vha->dpc_flags);		&vha->dpc_flags);
	}		}
	qla2xxx_wake_dpc(vha);
	ha->flags.isp82xx_fw_hung = 1;		ha->flags.isp82xx_fw_hung = 1;
	ql_log(ql_log_warn, vha, 0x6007, "Firmware hung.\n");		ql_log(ql_log_warn, vha, 0x6007, "Firmware hung.\n");
	qla82xx_clear_pending_mbx(vha);		qla82xx_clear_pending_mbx(vha);