Commit 3969251b authored by scameron@beardog.cca.cpqcorp.net's avatar scameron@beardog.cca.cpqcorp.net Committed by Jens Axboe
Browse files

cciss: decode unit attention in SCSI error handling code 



Make SCSI reset error handler decode unit attention ASC
and after a target reset wait for a unit attention that indicates
a reset occurred rather than just for any old unit attention.

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cca.cpqcorp.net>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 72f9f132

drivers/block/cciss_scsi.c

+16 −7
Original line number Diff line number Diff line
@@ -1604,16 +1604,25 @@ static int wait_for_device_to_become_ready(ctlr_info_t *h, 


		(void) process_sendcmd_error(h, c);



		if (rc == 0 && c->err_info->CommandStatus == CMD_SUCCESS)

			break;

		if (rc != 0)

			goto retry_tur;



		if (rc == 0 &&

			c->err_info->CommandStatus == CMD_TARGET_STATUS &&

			c->err_info->ScsiStatus == SAM_STAT_CHECK_CONDITION &&

			(c->err_info->SenseInfo[2] == NO_SENSE ||

			c->err_info->SenseInfo[2] == UNIT_ATTENTION))

		if (c->err_info->CommandStatus == CMD_SUCCESS)

			break;



		if (c->err_info->CommandStatus == CMD_TARGET_STATUS &&

			c->err_info->ScsiStatus == SAM_STAT_CHECK_CONDITION) {

			if (c->err_info->SenseInfo[2] == NO_SENSE)

				break;

			if (c->err_info->SenseInfo[2] == UNIT_ATTENTION) {

				unsigned char asc;

				asc = c->err_info->SenseInfo[12];

				check_for_unit_attention(h, c);

				if (asc == POWER_OR_RESET)

					break;

			}

		}

retry_tur:

		printk(KERN_WARNING "cciss%d: Waiting %d secs "

			"for device to become ready.\n",

			h->ctlr, waittime / HZ);

CRA Git | Maintained and supported by SUSTech CRA and CCSE