summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/asym_sun.c49
-rw-r--r--usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/sym.c4
-rw-r--r--usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tape.c20
-rw-r--r--usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c64
-rw-r--r--usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c59
-rw-r--r--usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c35
-rw-r--r--usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h10
7 files changed, 134 insertions, 107 deletions
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/asym_sun.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/asym_sun.c
index f257e5adb9..4ac6b86d29 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/asym_sun.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/asym_sun.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -225,7 +225,7 @@ void *ctpriv)
struct scsi_address *ap;
int err, retry_cnt, retry_cmd_cnt;
int mode, ownership, retval, xlf;
- struct scsi_extended_sense *sns;
+ uint8_t *sns, skey, asc, ascq;
ap = &sd->sd_address;
@@ -315,18 +315,20 @@ retry:
*/
retry_cmd_cnt = 0;
if (pkt->pkt_state & STATE_ARQ_DONE) {
- sns = &(((struct scsi_arq_status *)(uintptr_t)
+ sns = (uint8_t *)
+ &(((struct scsi_arq_status *)(uintptr_t)
(pkt->pkt_scbp))->sts_sensedata);
- if (sns->es_key == KEY_UNIT_ATTENTION) {
+ skey = scsi_sense_key(sns);
+ asc = scsi_sense_asc(sns);
+ ascq = scsi_sense_ascq(sns);
+ if (skey == KEY_UNIT_ATTENTION) {
/*
* swallow unit attention
*/
goto retry;
- } else if ((sns->es_key == KEY_NOT_READY) &&
- (sns->es_add_code ==
- T3_SCSI_ASC_FO_IN_PROGRESS) &&
- (sns->es_qual_code ==
- T3_SCSI_ASCQ_PATH_INACT2ACT)) {
+ } else if ((skey == KEY_NOT_READY) &&
+ (asc == T3_SCSI_ASC_FO_IN_PROGRESS) &&
+ (ascq == T3_SCSI_ASCQ_PATH_INACT2ACT)) {
if (retry_cnt++ >=
PURPLE_FO_MAX_RETRIES) {
cmn_err(CE_WARN, "!T3 failover"
@@ -345,8 +347,7 @@ retry:
}
cmn_err(CE_NOTE, "!T3 failover failed;"
" sense key:%x, ASC: %x, "
- "ASCQ:%x", sns->es_key,
- sns->es_add_code, sns->es_qual_code);
+ "ASCQ:%x", skey, asc, ascq);
scsi_destroy_pkt(pkt);
scsi_free_consistent_buf(bp);
return (1);
@@ -507,18 +508,23 @@ static int purple_path_ping(struct scsi_device *sd, void *ctpriv)
/* ARGSUSED */
static int
-purple_analyze_sense(struct scsi_device *sd, struct scsi_extended_sense
-*sense, void *ctpriv)
+purple_analyze_sense(struct scsi_device *sd, uint8_t *sense,
+void *ctpriv)
{
- if (sense->es_key == KEY_NOT_READY) {
- if (sense->es_add_code == T3_SCSI_ASC_FO_IN_PROGRESS) {
- if (sense->es_qual_code == T3_SCSI_ASCQ_PATH_INACT2ACT)
+ uint8_t skey, asc, ascq;
+
+ skey = scsi_sense_key(sense);
+ asc = scsi_sense_asc(sense);
+ ascq = scsi_sense_ascq(sense);
+
+ if (skey == KEY_NOT_READY) {
+ if (asc == T3_SCSI_ASC_FO_IN_PROGRESS) {
+ if (ascq == T3_SCSI_ASCQ_PATH_INACT2ACT)
return (SCSI_SENSE_INACT2ACT);
- else if (sense->es_qual_code ==
- T3_SCSI_ASCQ_PATH_ACT2INACT)
+ else if (ascq == T3_SCSI_ASCQ_PATH_ACT2INACT)
return (SCSI_SENSE_ACT2INACT);
- } else if ((sense->es_add_code == T3_SCSI_ASC_PATH_INACTIVE) &&
- (sense->es_qual_code == T3_SCSI_ASCQ_PATH_INACTIVE)) {
+ } else if ((asc == T3_SCSI_ASC_PATH_INACTIVE) &&
+ (ascq == T3_SCSI_ASCQ_PATH_INACTIVE)) {
return (SCSI_SENSE_INACTIVE);
}
}
@@ -529,8 +535,7 @@ purple_analyze_sense(struct scsi_device *sd, struct scsi_extended_sense
* return SCSI_SENSE_UNKNOWN.
*/
VHCI_DEBUG(6, (CE_NOTE, NULL, "!T3 analyze sense UNKNOWN:"
- " sense key:%x, ASC: %x, ASCQ:%x\n", sense->es_key,
- sense->es_add_code, sense->es_qual_code));
+ " sense key:%x, ASC: %x, ASCQ:%x\n", skey, asc, ascq));
return (SCSI_SENSE_UNKNOWN);
}
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/sym.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/sym.c
index d9f24ba702..50caf4395e 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/sym.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/sym.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -157,7 +157,7 @@ symmetric_path_ping(struct scsi_device *sd, void *ctpriv)
/* ARGSUSED */
static int
symmetric_analyze_sense(struct scsi_device *sd,
-struct scsi_extended_sense *sense, void *ctpriv)
+uint8_t *sense, void *ctpriv)
{
return (SCSI_SENSE_NOFAILOVER);
}
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tape.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tape.c
index 4154e9dd77..18511f721d 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tape.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tape.c
@@ -180,17 +180,23 @@ tape_path_ping(struct scsi_device *sd, void *ctpriv)
/* ARGSUSED */
static int
-tape_analyze_sense(struct scsi_device *sd, struct scsi_extended_sense *sense,
+tape_analyze_sense(struct scsi_device *sd, uint8_t *sense,
void *ctpriv)
{
- if (sense->es_key == KEY_ABORTED_COMMAND &&
- sense->es_add_code == 0x4b &&
- sense->es_qual_code == 0x83) {
+ uint8_t skey, asc, ascq;
+
+ skey = scsi_sense_key(sense);
+ asc = scsi_sense_asc(sense);
+ ascq = scsi_sense_ascq(sense);
+
+ if (skey == KEY_ABORTED_COMMAND &&
+ asc == 0x4b &&
+ ascq == 0x83) {
return (SCSI_SENSE_INACTIVE);
}
- if (sense->es_key == KEY_NOT_READY &&
- sense->es_add_code == 0x4 &&
- sense->es_qual_code == 0x1) {
+ if (skey == KEY_NOT_READY &&
+ asc == 0x4 &&
+ ascq == 0x1) {
return (SCSI_SENSE_NOT_READY);
}
return (SCSI_SENSE_NOFAILOVER);
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c
index e9c9e7aa5c..e00bad32bd 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/fops/tpgs.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -137,7 +137,7 @@ static int
std_process_cmplt_pkt(struct scsi_device *sd, struct scsi_pkt *pkt,
int *retry_cnt)
{
- struct scsi_extended_sense *sns;
+ uint8_t *sns, skey, asc, ascq;
/*
* Re-initialize retry_cmd_cnt. Allow transport and
@@ -149,20 +149,24 @@ std_process_cmplt_pkt(struct scsi_device *sd, struct scsi_pkt *pkt,
* while waiting for the fo to complete.
*/
if (pkt->pkt_state & STATE_ARQ_DONE) {
- sns = &(((struct scsi_arq_status *)(uintptr_t)
+ sns = (uint8_t *)
+ &(((struct scsi_arq_status *)(uintptr_t)
(pkt->pkt_scbp))->sts_sensedata);
- if (sns->es_key == KEY_UNIT_ATTENTION) {
+ skey = scsi_sense_key(sns);
+ asc = scsi_sense_asc(sns);
+ ascq = scsi_sense_ascq(sns);
+ if (skey == KEY_UNIT_ATTENTION) {
/*
* tpgs access state changed
*/
- if (sns->es_add_code == STD_SCSI_ASC_STATE_CHG &&
- sns->es_qual_code == STD_SCSI_ASCQ_STATE_CHG_SUCC) {
+ if (asc == STD_SCSI_ASC_STATE_CHG &&
+ ascq == STD_SCSI_ASCQ_STATE_CHG_SUCC) {
/* XXX: update path info? */
cmn_err(CE_WARN, "!Device failover"
" state change");
}
return (1);
- } else if (sns->es_key == KEY_NOT_READY) {
+ } else if (skey == KEY_NOT_READY) {
if ((*retry_cnt)++ >=
STD_FO_MAX_RETRIES) {
cmn_err(CE_WARN, "!Device failover"
@@ -178,8 +182,7 @@ std_process_cmplt_pkt(struct scsi_device *sd, struct scsi_pkt *pkt,
}
cmn_err(CE_NOTE, "!Failover failed;"
" sense key:%x, ASC: %x, "
- "ASCQ:%x", sns->es_key,
- sns->es_add_code, sns->es_qual_code);
+ "ASCQ:%x", skey, asc, ascq);
return (0);
}
switch (SCBP_C(pkt)) {
@@ -413,41 +416,43 @@ static int std_path_ping(struct scsi_device *sd, void *ctpriv)
*/
/* ARGSUSED */
static int
-std_analyze_sense(struct scsi_device *sd, struct scsi_extended_sense *sense,
+std_analyze_sense(struct scsi_device *sd, uint8_t *sense,
void *ctpriv)
{
int rval = SCSI_SENSE_UNKNOWN;
- if ((sense->es_key == KEY_UNIT_ATTENTION) &&
- (sense->es_add_code == STD_SCSI_ASC_STATE_CHG) &&
- (sense->es_qual_code == STD_SCSI_ASCQ_STATE_CHG_SUCC)) {
+ uint8_t skey, asc, ascq;
+
+ skey = scsi_sense_key(sense);
+ asc = scsi_sense_asc(sense);
+ ascq = scsi_sense_ascq(sense);
+
+ if ((skey == KEY_UNIT_ATTENTION) &&
+ (asc == STD_SCSI_ASC_STATE_CHG) &&
+ (ascq == STD_SCSI_ASCQ_STATE_CHG_SUCC)) {
rval = SCSI_SENSE_STATE_CHANGED;
VHCI_DEBUG(4, (CE_NOTE, NULL, "!std_analyze_sense:"
" sense_key:%x, add_code: %x, qual_code:%x"
- " sense:%x\n", sense->es_key, sense->es_add_code,
- sense->es_qual_code, rval));
- } else if ((sense->es_key == KEY_NOT_READY) &&
- (sense->es_add_code == STD_LOGICAL_UNIT_NOT_ACCESSIBLE) &&
- (sense->es_qual_code == STD_TGT_PORT_UNAVAILABLE)) {
+ " sense:%x\n", skey, asc, ascq, rval));
+ } else if ((skey == KEY_NOT_READY) &&
+ (asc == STD_LOGICAL_UNIT_NOT_ACCESSIBLE) &&
+ (ascq == STD_TGT_PORT_UNAVAILABLE)) {
rval = SCSI_SENSE_INACTIVE;
VHCI_DEBUG(4, (CE_NOTE, NULL, "!std_analyze_sense:"
" sense_key:%x, add_code: %x, qual_code:%x"
- " sense:%x\n", sense->es_key, sense->es_add_code,
- sense->es_qual_code, rval));
- } else if ((sense->es_key == KEY_ILLEGAL_REQUEST) &&
- (sense->es_add_code == STD_SCSI_ASC_INVAL_PARAM_LIST)) {
+ " sense:%x\n", skey, asc, ascq, rval));
+ } else if ((skey == KEY_ILLEGAL_REQUEST) &&
+ (asc == STD_SCSI_ASC_INVAL_PARAM_LIST)) {
rval = SCSI_SENSE_NOFAILOVER;
VHCI_DEBUG(1, (CE_NOTE, NULL, "!std_analyze_sense:"
" sense_key:%x, add_code: %x, qual_code:%x"
- " sense:%x\n", sense->es_key, sense->es_add_code,
- sense->es_qual_code, rval));
- } else if ((sense->es_key == KEY_ILLEGAL_REQUEST) &&
- (sense->es_add_code == STD_SCSI_ASC_INVAL_CMD_OPCODE)) {
+ " sense:%x\n", skey, asc, ascq, rval));
+ } else if ((skey == KEY_ILLEGAL_REQUEST) &&
+ (asc == STD_SCSI_ASC_INVAL_CMD_OPCODE)) {
rval = SCSI_SENSE_NOFAILOVER;
VHCI_DEBUG(1, (CE_NOTE, NULL, "!std_analyze_sense:"
" sense_key:%x, add_code: %x, qual_code:%x"
- " sense:%x\n", sense->es_key, sense->es_add_code,
- sense->es_qual_code, rval));
+ " sense:%x\n", skey, asc, ascq, rval));
} else {
/*
* At this point sense data may be for power-on-reset
@@ -455,8 +460,7 @@ std_analyze_sense(struct scsi_device *sd, struct scsi_extended_sense *sense,
* For all these cases, return SCSI_SENSE_UNKNOWN.
*/
VHCI_DEBUG(1, (CE_NOTE, NULL, "!Analyze sense UNKNOWN:"
- " sense key:%x, ASC:%x, ASCQ:%x\n", sense->es_key,
- sense->es_add_code, sense->es_qual_code));
+ " sense key:%x, ASC:%x, ASCQ:%x\n", skey, asc, ascq));
}
return (rval);
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
index faa4f51130..812d3b2d48 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
@@ -2469,7 +2469,7 @@ vhci_do_prout(scsi_vhci_priv_t *svp)
struct buf *bp;
scsi_vhci_lun_t *vlun = svp->svp_svl;
int rval, retry, nr_retry, ua_retry;
- struct scsi_extended_sense *sns;
+ uint8_t *sns, skey;
bp = getrbuf(KM_SLEEP);
bp->b_flags = B_WRITE;
@@ -2504,10 +2504,12 @@ again:
if ((new_pkt->pkt_reason == CMD_CMPLT) &&
(SCBP_C(new_pkt) == STATUS_CHECK) &&
(new_pkt->pkt_state & STATE_ARQ_DONE)) {
- sns = &(((struct scsi_arq_status *)(uintptr_t)
+ sns = (uint8_t *)
+ &(((struct scsi_arq_status *)(uintptr_t)
(new_pkt->pkt_scbp))->sts_sensedata);
- if ((sns->es_key == KEY_UNIT_ATTENTION) ||
- (sns->es_key == KEY_NOT_READY)) {
+ skey = scsi_sense_key(sns);
+ if ((skey == KEY_UNIT_ATTENTION) ||
+ (skey == KEY_NOT_READY)) {
int max_retry;
struct scsi_failover_ops *fops;
fops = vlun->svl_fops;
@@ -2552,7 +2554,7 @@ again:
new_pkt->pkt_cdbp[0],
new_pkt->pkt_cdbp[1],
new_pkt->pkt_cdbp[2]));
- } else if (sns->es_key == KEY_ILLEGAL_REQUEST)
+ } else if (skey == KEY_ILLEGAL_REQUEST)
rval = VHCI_PGR_ILLEGALOP;
}
} else {
@@ -3047,7 +3049,7 @@ vhci_intr(struct scsi_pkt *pkt)
scsi_vhci_lun_t *vlun;
int rval, held;
struct scsi_failover_ops *fops;
- struct scsi_extended_sense *sns;
+ uint8_t *sns, skey, asc, ascq;
mdi_pathinfo_t *lpath;
static char *timeout_err = "Command Timeout";
static char *parity_err = "Parity Error";
@@ -3111,14 +3113,17 @@ vhci_intr(struct scsi_pkt *pkt)
switch (*(pkt->pkt_scbp)) {
case STATUS_CHECK:
if (pkt->pkt_state & STATE_ARQ_DONE) {
- sns = &(((struct scsi_arq_status *)(uintptr_t)
+ sns = (uint8_t *)
+ &(((struct scsi_arq_status *)(uintptr_t)
(pkt->pkt_scbp))->sts_sensedata);
+ skey = scsi_sense_key(sns);
+ asc = scsi_sense_asc(sns);
+ ascq = scsi_sense_ascq(sns);
fops = vlun->svl_fops;
ASSERT(fops != NULL);
VHCI_DEBUG(4, (CE_NOTE, NULL, "vhci_intr: "
"Received sns key %x esc %x escq %x\n",
- sns->es_key, sns->es_add_code,
- sns->es_qual_code));
+ skey, asc, ascq));
if (vlun->svl_waiting_for_activepath == 1) {
/*
@@ -3134,7 +3139,7 @@ vhci_intr(struct scsi_pkt *pkt)
vpkt->vpkt_tgt_init_scblen);
break;
}
- if (sns->es_add_code == VHCI_SCSI_PERR) {
+ if (asc == VHCI_SCSI_PERR) {
/*
* parity error
*/
@@ -3530,7 +3535,7 @@ static int
vhci_efo_watch_cb(caddr_t arg, struct scsi_watch_result *resultp)
{
struct scsi_status *statusp = resultp->statusp;
- struct scsi_extended_sense *sensep = resultp->sensep;
+ uint8_t *sensep = (uint8_t *)resultp->sensep;
struct scsi_pkt *pkt = resultp->pkt;
scsi_vhci_swarg_t *swarg;
scsi_vhci_priv_t *svp;
@@ -6840,11 +6845,15 @@ check_path_again:
}
if (check_condition &&
(pkt->pkt_state & STATE_ARQ_DONE)) {
- struct scsi_extended_sense *sns =
+ uint8_t *sns, skey, asc, ascq;
+ sns = (uint8_t *)
&(((struct scsi_arq_status *)(uintptr_t)
(pkt->pkt_scbp))->sts_sensedata);
- if (sns->es_key == KEY_UNIT_ATTENTION &&
- sns->es_add_code == 0x29) {
+ skey = scsi_sense_key(sns);
+ asc = scsi_sense_asc(sns);
+ ascq = scsi_sense_ascq(sns);
+ if (skey == KEY_UNIT_ATTENTION &&
+ asc == 0x29) {
/* Already failed over */
VHCI_DEBUG(1, (CE_NOTE, NULL,
"!vhci_failover(7)(%s): "
@@ -6859,9 +6868,8 @@ check_path_again:
VHCI_DEBUG(1, (CE_NOTE, NULL,
"!vhci_failover(%s): path 0x%p "
"unhandled chkcond %x %x %x\n",
- guid, (void *)npip, sns->es_key,
- sns->es_add_code,
- sns->es_qual_code));
+ guid, (void *)npip, skey,
+ asc, ascq));
}
}
scsi_destroy_pkt(pkt);
@@ -7218,7 +7226,7 @@ vhci_do_scsi_cmd(struct scsi_pkt *pkt)
{
int err = 0;
int retry_cnt = 0;
- struct scsi_extended_sense *sns;
+ uint8_t *sns, skey;
#ifdef DEBUG
if (vhci_debug > 5) {
@@ -7246,12 +7254,14 @@ retry:
if ((pkt->pkt_reason == CMD_CMPLT) &&
(SCBP_C(pkt) == STATUS_CHECK) &&
(pkt->pkt_state & STATE_ARQ_DONE)) {
- sns = &(((struct scsi_arq_status *)(uintptr_t)
+ sns = (uint8_t *)
+ &(((struct scsi_arq_status *)(uintptr_t)
(pkt->pkt_scbp))->sts_sensedata);
+ skey = scsi_sense_key(sns);
VHCI_DEBUG(1, (CE_WARN, NULL,
"!v_s_do_s_c:retry "
"packet 0x%p sense data %s", (void *)pkt,
- scsi_sname(sns->es_key)));
+ scsi_sname(skey)));
}
goto retry;
}
@@ -7272,14 +7282,15 @@ retry:
break;
case STATUS_CHECK:
if (pkt->pkt_state & STATE_ARQ_DONE) {
- sns = &(((
+ sns = (uint8_t *)&(((
struct scsi_arq_status *)
(uintptr_t)
(pkt->pkt_scbp))->
sts_sensedata);
- if ((sns->es_key ==
+ skey = scsi_sense_key(sns);
+ if ((skey ==
KEY_UNIT_ATTENTION) ||
- (sns->es_key ==
+ (skey ==
KEY_NOT_READY)) {
/*
* clear unit attn.
@@ -7293,7 +7304,7 @@ retry:
"data %s",
(void *)pkt,
scsi_sname
- (sns->es_key)));
+ (skey)));
goto retry;
}
VHCI_DEBUG(4, (CE_WARN, NULL,
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c
index 26bedc5559..727deb3af4 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci_tpgs.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -55,7 +55,7 @@ vhci_tpgs_set_target_groups(struct scsi_address *ap, int set_state,
struct buf *bp;
int len, rval, ss = SCSI_SENSE_UNKNOWN;
char *bufp;
- struct scsi_extended_sense *sns;
+ uint8_t *sns, skey, asc, ascq;
len = 8;
@@ -124,34 +124,35 @@ vhci_tpgs_set_target_groups(struct scsi_address *ap, int set_state,
} else if ((pkt->pkt_reason == CMD_CMPLT) &&
(SCBP_C(pkt) == STATUS_CHECK) &&
(pkt->pkt_state & STATE_ARQ_DONE)) {
- sns = &(((struct scsi_arq_status *)(uintptr_t)
+ sns = (uint8_t *)
+ &(((struct scsi_arq_status *)(uintptr_t)
(pkt->pkt_scbp))->sts_sensedata);
+ skey = scsi_sense_key(sns);
+ asc = scsi_sense_asc(sns);
+ ascq = scsi_sense_ascq(sns);
- if ((sns->es_key == KEY_UNIT_ATTENTION) &&
- (sns->es_add_code == STD_SCSI_ASC_STATE_CHG) &&
- (sns->es_qual_code == STD_SCSI_ASCQ_STATE_CHG_SUCC)) {
+ if ((skey == KEY_UNIT_ATTENTION) &&
+ (asc == STD_SCSI_ASC_STATE_CHG) &&
+ (ascq == STD_SCSI_ASCQ_STATE_CHG_SUCC)) {
ss = SCSI_SENSE_STATE_CHANGED;
VHCI_DEBUG(4, (CE_NOTE, NULL,
"!vhci_tpgs_set_target_groups:"
" sense:%x, add_code: %x, qual_code:%x"
- " sense:%x\n", sns->es_key, sns->es_add_code,
- sns->es_qual_code, ss));
- } else if ((sns->es_key == KEY_ILLEGAL_REQUEST) &&
- (sns->es_add_code == STD_SCSI_ASC_INVAL_PARAM_LIST)) {
+ " sense:%x\n", skey, asc, ascq, ss));
+ } else if ((skey == KEY_ILLEGAL_REQUEST) &&
+ (asc == STD_SCSI_ASC_INVAL_PARAM_LIST)) {
ss = SCSI_SENSE_NOFAILOVER;
VHCI_DEBUG(1, (CE_NOTE, NULL,
"!vhci_tpgs_set_target_groups:"
" sense:%x, add_code: %x, qual_code:%x"
- " sense:%x\n", sns->es_key, sns->es_add_code,
- sns->es_qual_code, ss));
- } else if ((sns->es_key == KEY_ILLEGAL_REQUEST) &&
- (sns->es_add_code == STD_SCSI_ASC_INVAL_CMD_OPCODE)) {
+ " sense:%x\n", skey, asc, ascq, ss));
+ } else if ((skey == KEY_ILLEGAL_REQUEST) &&
+ (asc == STD_SCSI_ASC_INVAL_CMD_OPCODE)) {
ss = SCSI_SENSE_NOFAILOVER;
VHCI_DEBUG(1, (CE_NOTE, NULL,
"!vhci_tpgs_set_target_groups:"
" sense_key:%x, add_code: %x, qual_code:%x"
- " sense:%x\n", sns->es_key, sns->es_add_code,
- sns->es_qual_code, rval));
+ " sense:%x\n", skey, asc, ascq, rval));
} else {
/*
* At this point sns data may be for power-on-reset
@@ -162,7 +163,7 @@ vhci_tpgs_set_target_groups(struct scsi_address *ap, int set_state,
VHCI_DEBUG(1, (CE_NOTE, NULL,
"!vhci_tpgs_set_target_groups: "
" sense UNKNOWN: sense key:%x, ASC:%x, ASCQ:%x\n",
- sns->es_key, sns->es_add_code, sns->es_qual_code));
+ skey, asc, ascq));
}
if (ss == SCSI_SENSE_STATE_CHANGED) {
diff --git a/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h b/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h
index 726a96737c..ee7c032a1e 100644
--- a/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h
+++ b/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -600,9 +600,9 @@ struct scsi_failover_ops {
* failovers
*/
int (*sfo_analyze_sense)(
- struct scsi_device *sd,
- struct scsi_extended_sense *sense,
- void *ctpriv);
+ struct scsi_device *sd,
+ uint8_t *sense,
+ void *ctpriv);
/*
* return the next pathclass in order of preference
@@ -663,7 +663,7 @@ struct scsi_failover_ops {
struct scsi_device *, void *); \
static int local_name##_analyze_sense( \
struct scsi_device *, \
- struct scsi_extended_sense *, void *); \
+ uint8_t *, void *); \
static int local_name##_pathclass_next( \
char *, char **, void *); \
struct scsi_failover_ops ops_name##_failover_ops = { \
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-15 21:23:26 +0000