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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 5A24FC43387 for ; Tue, 15 Jan 2019 17:01:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CA2C20645 for ; Tue, 15 Jan 2019 17:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547571669; bh=SDr5bKsmtvr3jKErGt6i/jkmYbpxASafQBrAPvn/pj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MWxfYBR6MctkSW9Hgy/UtrPuMzTAdDKH611J6uLg/kzm3t3hHHnxNFO+PFYxK5HTH OCA/KgmiSP1EMTg2P/85VNn66lQCx6dJ9cCookaaGRDejOkS66Rw36ouv8EoqSFli9 SfdMnXCwRhbrt/ovbiguY5k3saMgfi9FtUzEJgQE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731795AbfAORBE (ORCPT ); Tue, 15 Jan 2019 12:01:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:53856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728916AbfAOQiG (ORCPT ); Tue, 15 Jan 2019 11:38:06 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AB2232054F; Tue, 15 Jan 2019 16:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547570286; bh=SDr5bKsmtvr3jKErGt6i/jkmYbpxASafQBrAPvn/pj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QEKZhhTFvZsMuaXBGkW0Z39+Zm3/RuaVOEkYBIH76C7MNdveFuV8bjIttQiGYLK2j 7A6Ws4u6fsrzf3le+998zvDFGa4pV23IzbYa8QiFbOp+YAtr/ShasRCNNP749JqKsG Q8BbDhsXUxWFqaolG3FFrX9gbeTkUhYTsjuWKyBk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Icenowy Zheng , Alan Stern Subject: [PATCH 4.4 36/51] USB: storage: dont insert sane sense for SPC3+ when bad sense specified Date: Tue, 15 Jan 2019 17:35:32 +0100 Message-Id: <20190115154852.260919670@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190115154846.928796000@linuxfoundation.org> References: <20190115154846.928796000@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Icenowy Zheng commit c5603d2fdb424849360fe7e3f8c1befc97571b8c upstream. Currently the code will set US_FL_SANE_SENSE flag unconditionally if device claims SPC3+, however we should allow US_FL_BAD_SENSE flag to prevent this behavior, because SMI SM3350 UFS-USB bridge controller, which claims SPC4, will show strange behavior with 96-byte sense (put the chip into a wrong state that cannot read/write anything). Check the presence of US_FL_BAD_SENSE when assuming US_FL_SANE_SENSE on SPC4+ devices. Signed-off-by: Icenowy Zheng Cc: stable Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/scsiglue.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -223,8 +223,12 @@ static int slave_configure(struct scsi_d if (!(us->fflags & US_FL_NEEDS_CAP16)) sdev->try_rc_10_first = 1; - /* assume SPC3 or latter devices support sense size > 18 */ - if (sdev->scsi_level > SCSI_SPC_2) + /* + * assume SPC3 or latter devices support sense size > 18 + * unless US_FL_BAD_SENSE quirk is specified. + */ + if (sdev->scsi_level > SCSI_SPC_2 && + !(us->fflags & US_FL_BAD_SENSE)) us->fflags |= US_FL_SANE_SENSE; /* USB-IDE bridges tend to report SK = 0x04 (Non-recoverable