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

Commit 63154916 authored Nov 18, 2011 by Giridhar Malavali Committed by James Bottomley Dec 12, 2011

[SCSI] qla2xxx: Disable generating pause frames when firmware hang detected for ISP82xx.



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 8937f2f1

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@
	* \| Level \| Last Value Used \| Holes \|		* \| Level \| Last Value Used \| Holes \|
	* ----------------------------------------------------------------------		* ----------------------------------------------------------------------
	* \| Module Init and Probe \| 0x0116 \| \|		* \| Module Init and Probe \| 0x0116 \| \|
	* \| Mailbox commands \| 0x1129 \| \|		* \| Mailbox commands \| 0x112b \| \|
	* \| Device Discovery \| 0x2083 \| \|		* \| Device Discovery \| 0x2083 \| \|
	* \| Queue Command and IO tracing \| 0x302e \| 0x3008 \|		* \| Queue Command and IO tracing \| 0x302e \| 0x3008 \|
	* \| DPC Thread \| 0x401c \| \|		* \| DPC Thread \| 0x401c \| \|

drivers/scsi/qla2xxx/qla_mbx.c

+18 −2

Original line number	Original line	Diff line number	Diff line
	@@ -303,7 +303,15 @@ qla2x00_mailbox_command(scsi_qla_host_t vha, mbx_cmd_t mcp)
	if (!test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) &&		if (!test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) &&
	!test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) &&		!test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) &&
	!test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {		!test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
			if (IS_QLA82XX(ha)) {
			ql_dbg(ql_dbg_mbx, vha, 0x112a,
			"disabling pause transmit on port "
			"0 & 1.\n");
			qla82xx_wr_32(ha,
			QLA82XX_CRB_NIU + 0x98,
			CRB_NIU_XG_PAUSE_CTL_P0\|
			CRB_NIU_XG_PAUSE_CTL_P1);
			}
	ql_log(ql_log_info, base_vha, 0x101c,		ql_log(ql_log_info, base_vha, 0x101c,
	"Mailbox cmd timeout occured. "		"Mailbox cmd timeout occured. "
	"Scheduling ISP abort eeh_busy=0x%x.\n",		"Scheduling ISP abort eeh_busy=0x%x.\n",
	@@ -319,7 +327,15 @@ qla2x00_mailbox_command(scsi_qla_host_t vha, mbx_cmd_t mcp)
	if (!test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) &&		if (!test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) &&
	!test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) &&		!test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) &&
	!test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {		!test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
			if (IS_QLA82XX(ha)) {
			ql_dbg(ql_dbg_mbx, vha, 0x112b,
			"disabling pause transmit on port "
			"0 & 1.\n");
			qla82xx_wr_32(ha,
			QLA82XX_CRB_NIU + 0x98,
			CRB_NIU_XG_PAUSE_CTL_P0\|
			CRB_NIU_XG_PAUSE_CTL_P1);
			}
	ql_log(ql_log_info, base_vha, 0x101e,		ql_log(ql_log_info, base_vha, 0x101e,
	"Mailbox cmd timeout occured. "		"Mailbox cmd timeout occured. "
	"Scheduling ISP abort.\n");		"Scheduling ISP abort.\n");

drivers/scsi/qla2xxx/qla_nx.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3853,9 +3853,13 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
	qla2xxx_wake_dpc(vha);		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,
			"disabling pause transmit on port 0 & 1.\n");
			qla82xx_wr_32(ha, QLA82XX_CRB_NIU + 0x98,
			CRB_NIU_XG_PAUSE_CTL_P0\|CRB_NIU_XG_PAUSE_CTL_P1);
	halt_status = qla82xx_rd_32(ha,		halt_status = qla82xx_rd_32(ha,
	QLA82XX_PEG_HALT_STATUS1);		QLA82XX_PEG_HALT_STATUS1);
	ql_dbg(ql_dbg_timer, vha, 0x6005,		ql_log(ql_log_info, vha, 0x6005,
	"dumping hw/fw registers:.\n "		"dumping hw/fw registers:.\n "
	" PEG_HALT_STATUS1: 0x%x, PEG_HALT_STATUS2: 0x%x,.\n "		" PEG_HALT_STATUS1: 0x%x, PEG_HALT_STATUS2: 0x%x,.\n "
	" PEG_NET_0_PC: 0x%x, PEG_NET_1_PC: 0x%x,.\n "		" PEG_NET_0_PC: 0x%x, PEG_NET_1_PC: 0x%x,.\n "

drivers/scsi/qla2xxx/qla_nx.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1173,4 +1173,8 @@ struct qla82xx_md_entry_queue {

	static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC,		static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC,
	0x410000B8, 0x410000BC };		0x410000B8, 0x410000BC };

			#define CRB_NIU_XG_PAUSE_CTL_P0 0x1
			#define CRB_NIU_XG_PAUSE_CTL_P1 0x8

	#endif		#endif