From: Tom Yan <tom.ty89@gmail.com>
To: hdegoede@redhat.com, hch@lst.de, gregkh@linuxfoundation.org,
linux-usb@vger.kernel.org
Cc: mathias.nyman@intel.com, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, baolu.lu@linux.intel.com,
Tom Yan <tom.ty89@gmail.com>
Subject: [PATCH 2/2] usb-storage: revert from scsi_add_host_with_dma() to scsi_add_host()
Date: Sat, 28 Nov 2020 23:48:49 +0800 [thread overview]
Message-ID: <20201128154849.3193-2-tom.ty89@gmail.com> (raw)
In-Reply-To: <20201128154849.3193-1-tom.ty89@gmail.com>
While the change only seemed to have caused issue on uas drives, we
probably want to avoid it in the usb-storage driver as well, until
we are sure it is the right thing to do.
Signed-off-by: Tom Yan <tom.ty89@gmail.com>
---
drivers/usb/storage/scsiglue.c | 40 +++++++++++++++++-----------------
drivers/usb/storage/usb.c | 3 +--
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 560efd1479ba..6539bae1c188 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -92,7 +92,7 @@ static int slave_alloc (struct scsi_device *sdev)
static int slave_configure(struct scsi_device *sdev)
{
struct us_data *us = host_to_us(sdev->host);
- struct device *dev = sdev->host->dma_dev;
+ struct device *dev = us->pusb_dev->bus->sysdev;
/*
* Many devices have trouble transferring more than 32KB at a time,
@@ -120,6 +120,25 @@ static int slave_configure(struct scsi_device *sdev)
* better throughput on most devices.
*/
blk_queue_max_hw_sectors(sdev->request_queue, 2048);
+ } else {
+ /*
+ * Limit the total size of a transfer to 120 KB.
+ *
+ * Some devices are known to choke with anything larger. It seems like
+ * the problem stems from the fact that original IDE controllers had
+ * only an 8-bit register to hold the number of sectors in one transfer
+ * and even those couldn't handle a full 256 sectors.
+ *
+ * Because we want to make sure we interoperate with as many devices as
+ * possible, we will maintain a 240 sector transfer size limit for USB
+ * Mass Storage devices.
+ *
+ * Tests show that other operating have similar limits with Microsoft
+ * Windows 7 limiting transfers to 128 sectors for both USB2 and USB3
+ * and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2
+ * and 2048 for USB3 devices.
+ */
+ blk_queue_max_hw_sectors(sdev->request_queue, 240);
}
/*
@@ -627,25 +646,6 @@ static const struct scsi_host_template usb_stor_host_template = {
.sg_tablesize = SG_MAX_SEGMENTS,
- /*
- * Limit the total size of a transfer to 120 KB.
- *
- * Some devices are known to choke with anything larger. It seems like
- * the problem stems from the fact that original IDE controllers had
- * only an 8-bit register to hold the number of sectors in one transfer
- * and even those couldn't handle a full 256 sectors.
- *
- * Because we want to make sure we interoperate with as many devices as
- * possible, we will maintain a 240 sector transfer size limit for USB
- * Mass Storage devices.
- *
- * Tests show that other operating have similar limits with Microsoft
- * Windows 7 limiting transfers to 128 sectors for both USB2 and USB3
- * and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2
- * and 2048 for USB3 devices.
- */
- .max_sectors = 240,
-
/* emulated HBA */
.emulated = 1,
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index c2ef367cf257..f177da4ff1bc 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -1050,8 +1050,7 @@ int usb_stor_probe2(struct us_data *us)
usb_autopm_get_interface_no_resume(us->pusb_intf);
snprintf(us->scsi_name, sizeof(us->scsi_name), "usb-storage %s",
dev_name(dev));
- result = scsi_add_host_with_dma(us_to_host(us), dev,
- us->pusb_dev->bus->sysdev);
+ result = scsi_add_host(us_to_host(us), dev);
if (result) {
dev_warn(dev,
"Unable to add the scsi host\n");
--
2.29.2
next prev parent reply other threads:[~2020-11-28 22:07 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-10 11:36 5.10 regression, many XHCI swiotlb buffer is full / DMAR: Device bounce map failed errors on thunderbolt connected XHCI controller Hans de Goede
2020-11-18 21:43 ` Hans de Goede
2020-11-23 14:49 ` Hans de Goede
2020-11-24 10:27 ` Christoph Hellwig
2020-11-24 10:31 ` Hans de Goede
2020-11-24 12:17 ` Mathias Nyman
2020-11-27 11:41 ` Hans de Goede
2020-11-27 12:32 ` 5.10 regression caused by: "uas: fix sdev->host->dma_dev": " Hans de Goede
2020-11-27 16:19 ` Christoph Hellwig
2020-11-27 18:12 ` Hans de Goede
2020-11-28 1:25 ` Tom Yan
2020-11-28 10:43 ` Hans de Goede
2020-11-28 15:48 ` [PATCH 1/2] uas: revert from scsi_add_host_with_dma() to scsi_add_host() Tom Yan
2020-11-28 15:48 ` Tom Yan [this message]
2020-11-30 9:50 ` [PATCH 2/2] usb-storage: " Hans de Goede
2020-11-30 12:58 ` Tom Yan
2020-11-30 13:23 ` Hans de Goede
2020-11-30 13:30 ` Greg KH
2020-11-30 13:36 ` Hans de Goede
2020-11-30 13:53 ` Greg KH
2020-11-30 13:55 ` Hans de Goede
2020-12-04 15:02 ` Greg KH
2020-11-30 17:20 ` Alan Stern
2020-11-30 17:24 ` Christoph Hellwig
2020-11-30 18:18 ` Hans de Goede
2020-11-30 18:57 ` Tom Yan
2020-11-30 19:01 ` Tom Yan
2020-11-30 20:36 ` Alan Stern
2020-11-30 14:39 ` Tom Yan
2020-11-30 9:48 ` [PATCH 1/2] uas: " Hans de Goede
2020-11-30 19:30 ` Tom Yan
2020-12-01 11:09 ` Hans de Goede
2020-11-28 17:15 ` 5.10 regression caused by: "uas: fix sdev->host->dma_dev": many XHCI swiotlb buffer is full / DMAR: Device bounce map failed errors on thunderbolt connected XHCI controller Christoph Hellwig
2020-11-30 8:43 ` Hans de Goede
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=20201128154849.3193-2-tom.ty89@gmail.com \
--to=tom.ty89@gmail.com \
--cc=baolu.lu@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).