From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4D10C433B4 for ; Mon, 26 Apr 2021 09:08:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B30C6023C for ; Mon, 26 Apr 2021 09:08:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232492AbhDZJIp (ORCPT ); Mon, 26 Apr 2021 05:08:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:57604 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232078AbhDZJIo (ORCPT ); Mon, 26 Apr 2021 05:08:44 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 81220B183; Mon, 26 Apr 2021 09:07:57 +0000 (UTC) To: Finn Thain Cc: "Martin K. Petersen" , Christoph Hellwig , James Bottomley , linux-scsi@vger.kernel.org, Bart van Assche References: <20210423113944.42672-1-hare@suse.de> <20210423113944.42672-25-hare@suse.de> <496782e-7377-ac6b-874-213f4e520b6@nippy.intranet> From: Hannes Reinecke Organization: SUSE Linux GmbH Subject: Re: [PATCH 24/39] wd33c93: translate message byte to host byte Message-ID: <46bf6a5b-966c-f379-059f-3fafce82692a@suse.de> Date: Mon, 26 Apr 2021 11:07:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: <496782e-7377-ac6b-874-213f4e520b6@nippy.intranet> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org On 4/24/21 11:20 AM, Finn Thain wrote: > On Fri, 23 Apr 2021, Hannes Reinecke wrote: > >> 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 >> --- >> 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: >> > > I think these three hunks all have the same mistake, which would force > SAM_STAT_GOOD. > Which mistake was that again? Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions Germany GmbH, 90409 Nürnberg GF: F. Imendörffer, HRB 36809 (AG Nürnberg)