scsi: dc395: Translate message bytes
authorHannes Reinecke <hare@suse.de>
Tue, 27 Apr 2021 08:30:25 +0000 (10:30 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 1 Jun 2021 02:48:22 +0000 (22:48 -0400)
Drop message byte setting if the host byte is already set, and translate
message bytes into the related host bytes when evaluating an overrun or
underrun.

Link: https://lore.kernel.org/r/20210427083046.31620-20-hare@suse.de
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/dc395x.c

index 598448e..24c7cef 100644 (file)
@@ -3226,7 +3226,6 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
                }
                dprintkdbg(DBG_0, "srb_done: AUTO_REQSENSE2\n");
 
-               set_msg_byte(cmd, srb->end_message);
                set_status_byte(cmd, SAM_STAT_CHECK_CONDITION);
 
                goto ckc_e;
@@ -3260,7 +3259,6 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
                } else {
                        srb->adapter_status = 0;
                        set_host_byte(cmd, DID_ERROR);
-                       set_msg_byte(cmd, srb->end_message);
                        set_status_byte(cmd, status);
                }
        } else {
@@ -3270,10 +3268,9 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
                status = srb->adapter_status;
                if (status & H_OVER_UNDER_RUN) {
                        srb->target_status = 0;
-                       set_msg_byte(cmd, srb->end_message);
+                       scsi_msg_to_host_byte(cmd, srb->end_message);
                } else if (srb->status & PARITY_ERROR) {
                        set_host_byte(cmd, DID_PARITY);
-                       set_msg_byte(cmd, srb->end_message);
                } else {        /* No error */
 
                        srb->adapter_status = 0;