From patchwork Tue May 15 15:16:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 10401383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 324B0601C8 for ; Tue, 15 May 2018 15:16:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21C8627F8F for ; Tue, 15 May 2018 15:16:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 167E927F95; Tue, 15 May 2018 15:16:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81DC527F8F for ; Tue, 15 May 2018 15:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754062AbeEOPQh (ORCPT ); Tue, 15 May 2018 11:16:37 -0400 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:42962 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072AbeEOPQg (ORCPT ); Tue, 15 May 2018 11:16:36 -0400 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 52AB88EE18D; Tue, 15 May 2018 08:16:36 -0700 (PDT) Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RYMpKn7qhOgW; Tue, 15 May 2018 08:16:36 -0700 (PDT) Received: from [10.246.11.48] (unknown [88.211.129.242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id DE1FF8EE0DC; Tue, 15 May 2018 08:16:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=hansenpartnership.com; s=20151216; t=1526397396; bh=Z6ZTwUkhJ9ADxGD+d4REBeGcQTUmGBniTaEXdCROSy0=; h=Subject:From:To:Cc:Date:From; b=bWrVdD2MXD8DfJ1nPd/7/wEFTbSow3ga6PVcKJfkhjkFqXd1DqRgEj6wMY+385bnq v8hc2FS+wkFbYgw70YjYZx1UljEvoHsv+eo5+ERqySZRVN2whewWk2Y6qCwXzbzIyd APi8AqcvCDsmfAWq9Kmk0/PexHcwnklgMS3S86ZA= Message-ID: <1526397392.17390.1.camel@HansenPartnership.com> Subject: [GIT PULL] SCSI fixes for 4.17-rc5 From: James Bottomley To: Andrew Morton , Linus Torvalds Cc: linux-scsi , linux-kernel Date: Tue, 15 May 2018 17:16:32 +0200 X-Mailer: Evolution 3.22.6 Mime-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Two small driver fixes: aacraid to fix an unknown IU type on task management functions which causes a firmware fault and vmw_pvscsi to change a return code to retry the operation instead of causing an immediate error The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes The short changelog is: Dave Carroll (1):       scsi: aacraid: Correct hba_send to include iu_type Jim Gill (1):       scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts And the diffstat:  drivers/scsi/aacraid/commsup.c | 8 ++++----  drivers/scsi/vmw_pvscsi.c      | 2 +-  2 files changed, 5 insertions(+), 5 deletions(-) With full diff below. James ---   case BTSTAT_SCSIPARITY: diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 0156c9623c35..d62ddd63f4fe 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c @@ -724,6 +724,8 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,   int wait;   unsigned long flags = 0;   unsigned long mflags = 0; + struct aac_hba_cmd_req *hbacmd = (struct aac_hba_cmd_req *) + fibptr->hw_fib_va;     fibptr->flags = (FIB_CONTEXT_FLAG | FIB_CONTEXT_FLAG_NATIVE_HBA);   if (callback) { @@ -734,11 +736,9 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback,   wait = 1;     - if (command == HBA_IU_TYPE_SCSI_CMD_REQ) { - struct aac_hba_cmd_req *hbacmd = - (struct aac_hba_cmd_req *)fibptr->hw_fib_va; + hbacmd->iu_type = command;   - hbacmd->iu_type = command; + if (command == HBA_IU_TYPE_SCSI_CMD_REQ) {   /* bit1 of request_id must be 0 */   hbacmd->request_id =   cpu_to_le32((((u32)(fibptr - dev->fibs)) << 2) + 1); diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index c374e3b5c678..777e5f1e52d1 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c @@ -609,7 +609,7 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter,   break;     case BTSTAT_ABORTQUEUE: - cmd->result = (DID_ABORT << 16); + cmd->result = (DID_BUS_BUSY << 16);   break;