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=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 26AC2C432C3 for ; Mon, 18 Nov 2019 11:44:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F29752084D for ; Mon, 18 Nov 2019 11:44:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574077481; bh=6vpk1PjCz7pXZgurWN76b4jGQlvmQN3FCNF9qUEut8o=; h=Subject:To:From:Date:List-ID:From; b=r6csLVs6p4Ji3gUCEpXEaq9Y0luhJSVUxbGnNNnIv2jsPtbMd4kDAASlNcZRRYOOC mqJOGEFudKGZgla3NXLV/iAinp4aYTIkJjEG4lqyLnlQUTv5Zrp+zAs0yN4uJ6A6CL BmPg7Da04uGlit4Re7o4IdhuH9Uwod9TDlk4enmc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726518AbfKRLok (ORCPT ); Mon, 18 Nov 2019 06:44:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:53282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726460AbfKRLoj (ORCPT ); Mon, 18 Nov 2019 06:44:39 -0500 Received: from localhost (unknown [89.205.134.48]) (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 7930420748; Mon, 18 Nov 2019 11:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574077479; bh=6vpk1PjCz7pXZgurWN76b4jGQlvmQN3FCNF9qUEut8o=; h=Subject:To:From:Date:From; b=IZEK2C0e9HP4ltxTmc9gwlqtVNpKCWJ72T+ylZn05vx7GaQ6OTV1ISNHrMq4KkMPA zZgjbaMpo3FXnpuJOe7jkB7PtSK78YPXA32UY/aSv7eBATcPVYmnQR/wkZUEJZNLzl AmFMLvEv3ncXZKNAEC5CNfRvmElEQkghCdOgFtu4= Subject: patch "USB: uas: heed CAPACITY_HEURISTICS" added to usb-testing To: oneukum@suse.com, gregkh@linuxfoundation.org, stable@vger.kernel.org From: Date: Mon, 18 Nov 2019 12:44:28 +0100 Message-ID: <157407746816360@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled USB: uas: heed CAPACITY_HEURISTICS to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Thu, 14 Nov 2019 12:27:57 +0100 Subject: USB: uas: heed CAPACITY_HEURISTICS There is no need to ignore this flag. We should be as close to storage in that regard as makes sense, so honor flags whose cost is tiny. Signed-off-by: Oliver Neukum Cc: stable Link: https://lore.kernel.org/r/20191114112758.32747-3-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/uas.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index def2d4aba549..475b9c692827 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -837,6 +837,12 @@ static int uas_slave_configure(struct scsi_device *sdev) if (devinfo->flags & US_FL_FIX_CAPACITY) sdev->fix_capacity = 1; + /* + * in some cases we have to guess + */ + if (devinfo->flags & US_FL_CAPACITY_HEURISTICS) + sdev->guess_capacity = 1; + /* * Some devices don't like MODE SENSE with page=0x3f, * which is the command used for checking if a device -- 2.24.0