Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp338607imm; Wed, 13 Jun 2018 00:57:55 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIYISMrVFFvKtyXxJ3GEZ3mdbYVfMahtn0o6RCwD4lg+lvRcpt1lfa/RkzGvTwZio4T0K5R X-Received: by 2002:a17:902:24c7:: with SMTP id l7-v6mr4076877plg.170.1528876675807; Wed, 13 Jun 2018 00:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528876675; cv=none; d=google.com; s=arc-20160816; b=dVmx2x+iB3LgxpT2EAyEUc08E5XeoACyendrChy0p6BmAZn7GwM/OgULad0gGf7+vV JtBlQIqKAMzKyWSgfSpBhOioi2oRAZJNn2Y3xOaKJjv0+MmyFUnHxu+7GyGm/QKBmWuD 1iElPPxMPM4c2cuP9hJp86oOQNrIkzBSD45K6GmIT1WcNA23g7sb3pkUVSARFMUkUuqW 4T8vxEI4eVt9JjlGeB2PUagQfThXYFiFr/yvsoZC7bAnn/P7MSx0JKL5YMXfsVhgmW/i cfZ4Vmhlv+s/bKHfGi4RXIaw0M3V2M79SQgJNm7siMv9n3tG/OSMjnaKffuZsNft0B8J t4tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=K+PAh+DVl4m2ybOzIgXJDbnIasNyD265IRuXXOZAQyU=; b=hroGSTD/kQ2VJPC0tJQWBE9EXiWZ+s7KSviPZXyc5DsOxciXiauQ5RxkQGCZ+xQYzQ RmoQsdA0/w+LQZsw/X2ZIGI8mwUnnwf8SpwQL/xCsYcntCooKLviQyZ80zyWUcm8U10H S6yjDtiKAIjhqhD8rfC36DBRZZj4ngJ/rRQFjyeH7vvwfRi1mw0b4mUL3oglEsgEjZWL 3/T44bu47oKA/qQ7ssClAPjaHpAxB534a6hLFrQsIHvDDlcywhGWfO8sOB39amrT2rgZ PbpOO0tfVBnSIZSCreVYfh8oJHIW0qgu7YRWjPJMN/AkmUdS6dmn28GGAZH+R9O73dFT bktw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k185-v6si1778924pgc.468.2018.06.13.00.57.41; Wed, 13 Jun 2018 00:57:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935026AbeFMHzh (ORCPT + 99 others); Wed, 13 Jun 2018 03:55:37 -0400 Received: from mx2.suse.de ([195.135.220.15]:41236 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754569AbeFMHxz (ORCPT ); Wed, 13 Jun 2018 03:53:55 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 97EAAAE81; Wed, 13 Jun 2018 07:53:54 +0000 (UTC) From: Johannes Thumshirn To: "Martin K . Petersen" Cc: Linux Kernel Mailinglist , Linux SCSI Mailinglist , Johannes Thumshirn Subject: [PATCH v2 3/3] scsi: don't add scsi command result bytes Date: Wed, 13 Jun 2018 09:53:49 +0200 Message-Id: <20180613075349.7509-4-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180613075349.7509-1-jthumshirn@suse.de> References: <20180613075349.7509-1-jthumshirn@suse.de> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some drivers are ADDing the scsi command's result bytes instead of ORing them. While this can produce correct results it has unexpected side effects. Signed-off-by: Johannes Thumshirn --- Changes since v1: - Fix kbuild robot warnings --- drivers/scsi/imm.c | 2 +- drivers/scsi/mesh.c | 4 ++-- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c index 87c94191033b..c8b3de035630 100644 --- a/drivers/scsi/imm.c +++ b/drivers/scsi/imm.c @@ -892,7 +892,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd) /* Check for optional message byte */ if (imm_wait(dev) == (unsigned char) 0xb8) imm_in(dev, &h, 1); - cmd->result = (DID_OK << 16) + (l & STATUS_MASK); + cmd->result = DID_OK << 16 | (l & STATUS_MASK); } if ((dev->mode == IMM_NIBBLE) || (dev->mode == IMM_PS2)) { w_ctr(ppb, 0x4); diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index 1753e42826dd..3473a860e690 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -594,9 +594,9 @@ static void mesh_done(struct mesh_state *ms, int start_next) ms->current_req = NULL; tp->current_req = NULL; if (cmd) { - cmd->result = (ms->stat << 16) + cmd->SCp.Status; + cmd->result = ms->stat << 16 | cmd->SCp.Status; if (ms->stat == DID_OK) - cmd->result += (cmd->SCp.Message << 8); + cmd->result |= cmd->SCp.Message << 8; if (DEBUG_TARGET(cmd)) { printk(KERN_DEBUG "mesh_done: result = %x, data_ptr=%d, buflen=%d\n", cmd->result, ms->data_ptr, scsi_bufflen(cmd)); diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 7320d5fe4cbc..afdbd5a66083 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c @@ -252,7 +252,7 @@ void sym_set_cam_result_error(struct sym_hcb *np, struct sym_ccb *cp, int resid) cam_status = sym_xerr_cam_status(DID_ERROR, cp->xerr_status); } scsi_set_resid(cmd, resid); - cmd->result = (drv_status << 24) + (cam_status << 16) + scsi_status; + cmd->result = drv_status << 24 | cam_status << 16 | scsi_status; } static int sym_scatter(struct sym_hcb *np, struct sym_ccb *cp, struct scsi_cmnd *cmd) diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h index 805369521df8..ec4af5e85142 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/drivers/scsi/sym53c8xx_2/sym_glue.h @@ -256,7 +256,7 @@ sym_get_cam_status(struct scsi_cmnd *cmd) static inline void sym_set_cam_result_ok(struct sym_ccb *cp, struct scsi_cmnd *cmd, int resid) { scsi_set_resid(cmd, resid); - cmd->result = (((DID_OK) << 16) + ((cp->ssss_status) & 0x7f)); + cmd->result = DID_OK << 16 | (cp->ssss_status & 0x7f); } void sym_set_cam_result_error(struct sym_hcb *np, struct sym_ccb *cp, int resid); -- 2.16.4