From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Bart van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 24/39] wd33c93: translate message byte to host byte
Date: Fri, 23 Apr 2021 13:39:29 +0200 [thread overview]
Message-ID: <20210423113944.42672-25-hare@suse.de> (raw)
In-Reply-To: <20210423113944.42672-1-hare@suse.de>
Instead of setting the message byte translate it to the appropriate
host byte. As error recovery would return DID_ERROR for any non-zero
message byte the translation doesn't change the error handling.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/wd33c93.c | 46 ++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index a23277bb870e..187b363db00e 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1176,13 +1176,14 @@ wd33c93_intr(struct Scsi_Host *instance)
if (cmd->SCp.Status == ILLEGAL_STATUS_BYTE)
cmd->SCp.Status = lun;
if (cmd->cmnd[0] == REQUEST_SENSE
- && cmd->SCp.Status != SAM_STAT_GOOD)
- cmd->result =
- (cmd->
- result & 0x00ffff) | (DID_ERROR << 16);
- else
- cmd->result =
- cmd->SCp.Status | (cmd->SCp.Message << 8);
+ && cmd->SCp.Status != SAM_STAT_GOOD) {
+ set_host_byte(cmd, DID_ERROR);
+ set_status_byte(cmd, SAM_STAT_GOOD);
+ } else {
+ set_host_byte(cmd, DID_OK);
+ translate_msg_byte(cmd, cmd->SCp.Message);
+ set_status_byte(cmd, cmd->SCp.Status);
+ }
cmd->scsi_done(cmd);
/* We are no longer connected to a target - check to see if
@@ -1262,11 +1263,15 @@ wd33c93_intr(struct Scsi_Host *instance)
hostdata->connected = NULL;
hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xff));
hostdata->state = S_UNCONNECTED;
- if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != SAM_STAT_GOOD)
- cmd->result =
- (cmd->result & 0x00ffff) | (DID_ERROR << 16);
- else
- cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8);
+ if (cmd->cmnd[0] == REQUEST_SENSE &&
+ cmd->SCp.Status != SAM_STAT_GOOD) {
+ set_host_byte(cmd, DID_ERROR);
+ set_status_byte(cmd, SAM_STAT_GOOD);
+ } else {
+ set_host_byte(cmd, DID_OK);
+ translate_msg_byte(cmd, cmd->SCp.Message);
+ set_status_byte(cmd, cmd->SCp.Status);
+ }
cmd->scsi_done(cmd);
/* We are no longer connected to a target - check to see if
@@ -1295,14 +1300,15 @@ wd33c93_intr(struct Scsi_Host *instance)
hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 0xff));
hostdata->state = S_UNCONNECTED;
DB(DB_INTR, printk(":%d", cmd->SCp.Status))
- if (cmd->cmnd[0] == REQUEST_SENSE
- && cmd->SCp.Status != SAM_STAT_GOOD)
- cmd->result =
- (cmd->
- result & 0x00ffff) | (DID_ERROR << 16);
- else
- cmd->result =
- cmd->SCp.Status | (cmd->SCp.Message << 8);
+ if (cmd->cmnd[0] == REQUEST_SENSE
+ && cmd->SCp.Status != SAM_STAT_GOOD) {
+ set_host_byte(cmd, DID_ERROR);
+ set_status_byte(cmd, SAM_STAT_GOOD);
+ } else {
+ set_host_byte(cmd, DID_OK);
+ translate_msg_byte(cmd, cmd->SCp.Message);
+ set_status_byte(cmd, cmd->SCp.Status);
+ }
cmd->scsi_done(cmd);
break;
case S_PRE_TMP_DISC:
--
2.29.2
next prev parent reply other threads:[~2021-04-23 11:40 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 11:39 [RFC PATCHv2 00/39] SCSI result cleanup, part 2 Hannes Reinecke
2021-04-23 11:39 ` [PATCH 01/39] st: return error code in st_scsi_execute() Hannes Reinecke
2021-04-26 3:19 ` Bart Van Assche
2021-04-26 14:51 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 02/39] scsi_ioctl: return error code when blk_rq_map_kern() fails Hannes Reinecke
2021-04-26 3:20 ` Bart Van Assche
2021-04-26 14:51 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 03/39] scsi_dh_alua: do not interpret DRIVER_ERROR Hannes Reinecke
2021-04-26 14:54 ` Christoph Hellwig
2021-04-26 15:17 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 04/39] scsi: Fixup calling convention for scsi_mode_sense() Hannes Reinecke
2021-04-26 3:21 ` Bart Van Assche
2021-04-26 14:57 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 05/39] scsi: stop using DRIVER_ERROR Hannes Reinecke
2021-04-26 3:26 ` Bart Van Assche
2021-04-26 15:01 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 06/39] scsi: introduce scsi_build_sense() Hannes Reinecke
2021-04-26 3:31 ` Bart Van Assche
2021-04-26 15:02 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 07/39] scsi: introduce scsi_status_is_check_condition() Hannes Reinecke
2021-04-26 3:34 ` Bart Van Assche
2021-04-26 6:58 ` Hannes Reinecke
2021-04-26 15:02 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 08/39] scsi: Kill DRIVER_SENSE Hannes Reinecke
2021-04-26 3:41 ` Bart Van Assche
2021-04-26 7:02 ` Hannes Reinecke
2021-04-26 15:20 ` Christoph Hellwig
2021-04-27 7:15 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 09/39] scsi: do not use DRIVER_INVALID Hannes Reinecke
2021-04-26 3:42 ` Bart Van Assche
2021-04-26 15:20 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 10/39] scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUT Hannes Reinecke
2021-04-26 3:42 ` Bart Van Assche
2021-04-26 15:21 ` Christoph Hellwig
2021-04-26 15:38 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 11/39] xen-scsiback: use DID_ERROR instead of DRIVER_ERROR Hannes Reinecke
2021-04-26 3:43 ` Bart Van Assche
2021-04-26 15:22 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 12/39] xen-scsifront: compability status handling Hannes Reinecke
2021-04-26 3:44 ` Bart Van Assche
2021-04-26 7:03 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 13/39] scsi: Drop the now obsolete driver_byte definitions Hannes Reinecke
2021-04-26 3:46 ` Bart Van Assche
2021-04-26 15:22 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 14/39] NCR5380: Fold SCSI message ABORT onto DID_ABORT Hannes Reinecke
2021-04-26 15:23 ` Christoph Hellwig
2021-04-26 15:43 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 15/39] scsi: add get_{status,host}_byte() accessor function Hannes Reinecke
2021-04-26 3:47 ` Bart Van Assche
2021-04-26 7:05 ` Hannes Reinecke
2021-04-26 15:23 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 16/39] scsi: add translate_msg_byte() Hannes Reinecke
2021-04-26 3:48 ` Bart Van Assche
2021-04-26 15:24 ` Christoph Hellwig
2021-04-26 15:43 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 17/39] dc395: use standard macros to set SCSI result Hannes Reinecke
2021-04-26 15:25 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 18/39] dc395: translate message bytes Hannes Reinecke
2021-04-26 15:25 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 19/39] qlogicfas408: make ql_pcmd() a void function Hannes Reinecke
2021-04-26 15:26 ` Christoph Hellwig
2021-04-26 15:45 ` Hannes Reinecke
2021-04-27 7:36 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 20/39] qlogicfas408: whitespace cleanup Hannes Reinecke
2021-04-23 11:39 ` [PATCH 21/39] qlogicfas408: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 22/39] nsp32: whitespace cleanup Hannes Reinecke
2021-04-23 11:39 ` [PATCH 23/39] nsp32: do not set message byte Hannes Reinecke
2021-04-23 11:39 ` Hannes Reinecke [this message]
2021-04-24 9:20 ` [PATCH 24/39] wd33c93: translate message byte to host byte Finn Thain
2021-04-26 9:07 ` Hannes Reinecke
2021-04-27 4:39 ` Finn Thain
2021-04-27 6:11 ` Hannes Reinecke
2021-04-23 11:39 ` [PATCH 25/39] mesh: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 26/39] acornscsi: remove acornscsi_reportstatus() Hannes Reinecke
2021-04-26 15:32 ` Christoph Hellwig
2021-04-23 11:39 ` [PATCH 27/39] acornscsi: translate message byte to host byte Hannes Reinecke
2021-04-23 11:39 ` [PATCH 28/39] aha152x: modify done() to use separate status bytes Hannes Reinecke
2021-04-23 11:39 ` [PATCH 29/39] aha152x: do not set message byte when calling scsi_done() Hannes Reinecke
2021-04-23 11:39 ` [PATCH 30/39] advansys: do not set message byte in SCSI status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 31/39] fas216: translate message to host byte status Hannes Reinecke
2021-04-23 11:39 ` [PATCH 32/39] fas216: Use get_status_byte() to avoid using linux-specific status codes Hannes Reinecke
2021-04-23 11:39 ` [PATCH 33/39] FlashPoint: Use standard SCSI definitions Hannes Reinecke
2021-04-23 11:39 ` [PATCH 34/39] fdomain: drop last argument to fdomain_finish_cmd() Hannes Reinecke
2021-04-23 11:39 ` [PATCH 35/39] fdomain: translate message to host byte status Hannes Reinecke
2021-04-24 9:21 ` Finn Thain
2021-04-23 11:39 ` [PATCH 36/39] scsi: drop message byte helper Hannes Reinecke
2021-04-26 3:48 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 37/39] scsi: kill message byte Hannes Reinecke
2021-04-26 3:50 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 38/39] target: use standard SAM status types Hannes Reinecke
2021-04-26 3:51 ` Bart Van Assche
2021-04-23 11:39 ` [PATCH 39/39] scsi: drop obsolete linux-specific SCSI status codes Hannes Reinecke
2021-04-26 3:55 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210423113944.42672-25-hare@suse.de \
--to=hare@suse.de \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox