public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: tom.ty89@gmail.com
To: gregkh@linuxfoundation.org
Cc: kraxel@redhat.com, stern@rowland.harvard.edu,
	linux-usb@vger.kernel.org, linux-scsi@vger.kernel.org,
	stable@vger.kernel.org, hdegoede@redhat.com,
	Tom Yan <tom.ty89@gmail.com>
Subject: [PATCH 1/1] uas: leave can_queue as MAX_CMNDS if device reports larger qdepth
Date: Tue, 24 May 2016 00:02:43 +0800	[thread overview]
Message-ID: <574329ae.c726620a.60f3.ffffd14b@mx.google.com> (raw)

From: Tom Yan <tom.ty89@gmail.com>

Commit 198de51dbc34 ("USB: uas: Limit qdepth at the scsi-host level") made
qdepth limit set in host template (`.can_queue = MAX_CMNDS`) useless.

Instead of removing the template limit, now we only change limit according
to the qdepth reported by the device if it is smaller than MAX_CMNDS.

Signed-off-by: Tom Yan <tom.ty89@gmail.com>

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 4d49fce..d7790e6 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -972,7 +972,8 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id)
 	 * 1 tag is reserved for untagged commands +
 	 * 1 tag to avoid off by one errors in some bridge firmwares
 	 */
-	shost->can_queue = devinfo->qdepth - 2;
+	if (devinfo->qdepth - 2 < MAX_CMNDS)
+		shost->can_queue = devinfo->qdepth - 2;
 
 	usb_set_intfdata(intf, shost);
 	result = scsi_add_host(shost, &intf->dev);
-- 
2.8.2


             reply	other threads:[~2016-05-23 16:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-23 16:02 tom.ty89 [this message]
2016-05-23 17:00 ` [PATCH 1/1] uas: leave can_queue as MAX_CMNDS if device reports larger qdepth Greg KH
2016-05-23 17:23   ` Tom Yan
2016-05-23 17:27     ` James Bottomley
2016-05-23 18:33       ` Tom Yan
2016-05-23 19:07         ` James Bottomley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=574329ae.c726620a.60f3.ffffd14b@mx.google.com \
    --to=tom.ty89@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox