Commit 72436192 authored Aug 08, 2019 by Bart Van Assche Committed by Martin K. Petersen Aug 12, 2019

scsi: qla2xxx: Report invalid mailbox status codes



It is easy to mix up the QLA_* and the MBS_* status codes. Complain loudly
if that happens.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Tested-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 1a20719e

drivers/scsi/qla2xxx/qla_def.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -990,6 +990,11 @@ struct mbx_cmd_32 {
		#define MBS_LINK_DOWN_ERROR 0x400B
		#define MBS_DIAG_ECHO_TEST_ERROR 0x400C

		static inline bool qla2xxx_is_valid_mbs(unsigned int mbs)
		{
		return MBS_COMMAND_COMPLETE <= mbs && mbs <= MBS_DIAG_ECHO_TEST_ERROR;
		}

		/*
		* ISP mailbox asynchronous event status codes
		*/

drivers/scsi/qla2xxx/qla_init.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -477,6 +477,9 @@ void qla24xx_handle_adisc_event(scsi_qla_host_t vha, struct event_arg ea)
		fcport->fw_login_state, ea->rc, fcport->login_gen, ea->sp->gen2,
		fcport->rscn_gen, ea->sp->gen1, fcport->loop_id);

		WARN_ONCE(!qla2xxx_is_valid_mbs(ea->data[0]), "mbs: %#x\n",
		ea->data[0]);

		if (ea->data[0] != MBS_COMMAND_COMPLETE) {
		ql_dbg(ql_dbg_disc, vha, 0x2066,
		"%s %8phC: adisc fail: post delete\n",
		@@ -1893,6 +1896,9 @@ qla24xx_async_abort_command(srb_t *sp)
		static void
		qla24xx_handle_prli_done_event(struct scsi_qla_host vha, struct event_arg ea)
		{
		WARN_ONCE(!qla2xxx_is_valid_mbs(ea->data[0]), "mbs: %#x\n",
		ea->data[0]);

		switch (ea->data[0]) {
		case MBS_COMMAND_COMPLETE:
		ql_dbg(ql_dbg_disc, vha, 0x2118,
		@@ -1978,6 +1984,9 @@ qla24xx_handle_plogi_done_event(struct scsi_qla_host vha, struct event_arg ea)
		return;
		}

		WARN_ONCE(!qla2xxx_is_valid_mbs(ea->data[0]), "mbs: %#x\n",
		ea->data[0]);

		switch (ea->data[0]) {
		case MBS_COMMAND_COMPLETE:
		/*