[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20090608211057.GN23523@beardog.cca.cpqcorp.net>
Date: Mon, 8 Jun 2009 16:10:57 -0500
From: scameron@...rdog.cca.cpqcorp.net
To: linux-kernel@...r.kernel.org, linux-scsi@...r.kernel.org,
axboe@...nel.dk, akpm@...ux-foundation.org
Cc: scameron@...rdog.cca.cpqcorp.net, mikem@...rdog.cca.cpqcorp.net
Subject: [patch 8/8] 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: Stephen M. Cameron <scameron@...rdog.cca.cpqcorp.net>
---
---
diff -puN drivers/block/cciss_scsi.c~decode_unit_attn drivers/block/cciss_scsi.c
--- linux-next/drivers/block/cciss_scsi.c~decode_unit_attn 2009-06-08 12:59:13.000000000 -0500
+++ linux-next-scameron/drivers/block/cciss_scsi.c 2009-06-08 14:35:43.000000000 -0500
@@ -1604,16 +1604,25 @@ static int wait_for_device_to_become_rea
(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);
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists