From patchwork Thu Sep 3 08:46:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 297742 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 06B68C433E7 for ; Thu, 3 Sep 2020 08:47:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5D8E206EB for ; Thu, 3 Sep 2020 08:46:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CH8Wo8Hh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728309AbgICIq7 (ORCPT ); Thu, 3 Sep 2020 04:46:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726448AbgICIqy (ORCPT ); Thu, 3 Sep 2020 04:46:54 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2421DC061244 for ; Thu, 3 Sep 2020 01:46:54 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id 17so1745513pfw.9 for ; Thu, 03 Sep 2020 01:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=beFsdmSBbRn+LGiu9ewoJnarM2j/jK8DgQ2Vvf17gI0=; b=CH8Wo8HhX80hsjwqP6BU/Cgn4s6ol+K0ryn6k6q3pkRlzxi8wpoUAirBmsnVsSz1de QvFnMESHznFRlQ7LxGrvJ0mx3uL8k+gKi4ARgmpaBxcFk3qTtkI1Z9GUYbOuTG6zmxZX U0/U/AIs2Gl1tW/PHLioXuDua4B16MnOg2lOmYxV6dx+f8PxdfhwOpy7ll91DEjW1+yR 9tMn7/03PY6S0T8LGFZqueG7DbKZlB9uGsdyU4tfEtJ2t4JwrHGHQWs0dIMAkOCDSZEK kSvClKec0uHXbk74RS8eYzaLYMYJL6Icf5yZ9N0kUDov8MzKSW6RVuZRiKUTmhuKDKdn 57Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=beFsdmSBbRn+LGiu9ewoJnarM2j/jK8DgQ2Vvf17gI0=; b=hYJVENTaxPnMoptVFJM8/7V7xE6fAv7f0D2V+seG8ywq9tbVSF6tCSAD8rD1PjKgYi OY1PeOVCQrnxQEY8+sYkkD9sbSXE8XrRwqm9LyIZ3sOMPOlUQ7hG8wYSI6TeuWqIs7Py zyFy6e/KjAMtzkHo9rarhM/JhAT4qoMvasFSheQtALxoqqOyR3VvWtB+Xd+3EcMI8qRs 5ds4mOQAvEPxNvzI6aE3Vx3gycL19c8KAay5+dFy28xRVVULmH7j8tn1QSktNmFHsoYw BVZn5Fz8ZG3leIzY5Z3AipmV3MAAOAL8phEqWVGfpcEm82uOoXo2ytCv++WukG6rWw6u 8ACw== X-Gm-Message-State: AOAM5312BYS5QWWSRZaiwCS/gAknDvOFVDxLdrT8negsnl14HAclM44C 8RZdm2hPCI/fLGtogUKrg8//oGagfBY= X-Google-Smtp-Source: ABdhPJyWOxQmcP0N/y+X6HgmHWwT9hHcFdB0Vvqj7eXLa6nu8uI2Kta80cR1BMxFqxjx1/SP2apT4A== X-Received: by 2002:a63:d25:: with SMTP id c37mr1999418pgl.403.1599122812161; Thu, 03 Sep 2020 01:46:52 -0700 (PDT) Received: from localhost.localdomain ([161.81.62.213]) by smtp.gmail.com with ESMTPSA id k5sm1840180pjq.5.2020.09.03.01.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 01:46:51 -0700 (PDT) From: Tom Yan To: linux-usb@vger.kernel.org, gregkh@linuxfoundation.org, stern@rowland.harvard.edu, arnd@arndb.de Cc: cyrozap@gmail.com, yoshihiro.shimoda.uh@renesas.com, Tom Yan Subject: [PATCH v4 1/2] usb-storage: fix sdev->host->dma_dev Date: Thu, 3 Sep 2020 16:46:44 +0800 Message-Id: <20200903084645.287856-1-tom.ty89@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200903083404.GA2169202@kroah.com> References: <20200903083404.GA2169202@kroah.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Use scsi_add_host_with_dma() instead of scsi_add_host() in usb.c and uas.c. When the scsi request queue is initialized/allocated, hw_max_sectors is clamped to the dma max mapping size. Therefore, the correct device that should be used for the clamping needs to be set. The same clamping is still needed in the USB drivers as hw_max_sectors could be changed there. The original clamping would be invalidated in such cases. Signed-off-by: Tom Yan --- v2: fix commit message line length; bump hw_max_sectors to 2048 for SS UAS drives; split the "fallback" hw_max_sectors setting into another patch v3: use a different approach: fix the dma_dev instead v4: add the changelog of the patch series drivers/usb/storage/scsiglue.c | 2 +- drivers/usb/storage/uas.c | 17 +++++++++++------ drivers/usb/storage/usb.c | 5 +++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index e5a971b83e3f..560efd1479ba 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 = us->pusb_dev->bus->sysdev; + struct device *dev = sdev->host->dma_dev; /* * Many devices have trouble transferring more than 32KB at a time, diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index 08f9296431e9..f4beeb8a8adb 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -827,17 +827,22 @@ static int uas_slave_alloc(struct scsi_device *sdev) */ blk_queue_update_dma_alignment(sdev->request_queue, (512 - 1)); - if (devinfo->flags & US_FL_MAX_SECTORS_64) - blk_queue_max_hw_sectors(sdev->request_queue, 64); - else if (devinfo->flags & US_FL_MAX_SECTORS_240) - blk_queue_max_hw_sectors(sdev->request_queue, 240); - return 0; } static int uas_slave_configure(struct scsi_device *sdev) { struct uas_dev_info *devinfo = sdev->hostdata; + struct device *dev = sdev->host->dma_dev; + + if (devinfo->flags & US_FL_MAX_SECTORS_64) + blk_queue_max_hw_sectors(sdev->request_queue, 64); + else if (devinfo->flags & US_FL_MAX_SECTORS_240) + blk_queue_max_hw_sectors(sdev->request_queue, 240); + + blk_queue_max_hw_sectors(sdev->request_queue, + min_t(size_t, queue_max_hw_sectors(sdev->request_queue), + dma_max_mapping_size(dev) >> SECTOR_SHIFT)); if (devinfo->flags & US_FL_NO_REPORT_OPCODES) sdev->no_report_opcodes = 1; @@ -1023,7 +1028,7 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id) shost->can_queue = devinfo->qdepth - 2; usb_set_intfdata(intf, shost); - result = scsi_add_host(shost, &intf->dev); + result = scsi_add_host_with_dma(shost, &intf->dev, udev->bus->sysdev); if (result) goto free_streams; diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index 94a64729dc27..c2ef367cf257 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -1049,8 +1049,9 @@ int usb_stor_probe2(struct us_data *us) goto BadDevice; usb_autopm_get_interface_no_resume(us->pusb_intf); snprintf(us->scsi_name, sizeof(us->scsi_name), "usb-storage %s", - dev_name(&us->pusb_intf->dev)); - result = scsi_add_host(us_to_host(us), dev); + dev_name(dev)); + result = scsi_add_host_with_dma(us_to_host(us), dev, + us->pusb_dev->bus->sysdev); if (result) { dev_warn(dev, "Unable to add the scsi host\n"); From patchwork Thu Sep 3 08:46:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 258663 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 8693BC433E2 for ; Thu, 3 Sep 2020 08:47:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50BC8206EB for ; Thu, 3 Sep 2020 08:47:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UOaNnRKr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728311AbgICIq7 (ORCPT ); Thu, 3 Sep 2020 04:46:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726493AbgICIq4 (ORCPT ); Thu, 3 Sep 2020 04:46:56 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 461DAC061245 for ; Thu, 3 Sep 2020 01:46:56 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id p37so1581955pgl.3 for ; Thu, 03 Sep 2020 01:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zPbBfYdRv19xF3sirA0d8CLfF89pzIdN85SmGePftxg=; b=UOaNnRKrHosvVy0IieS+UZfI+QddwkluwiP6zVw1BR1peNVsB5TQvTCn4GuoMQziDX Ot87UTS5/FVRZ3oxSUBVORyIul4XuY2xQFXANcikjDqsjGMYA4Ms3BRijnAVJLOpF/Lw pmD7K85G+bDbU05SqanIjvPoZts948ZDyJE1VQjBBmvsf1/Q32xifH8cHF3WMBZj1zkO KZjNBcCJY9ToPoMdDfS2vRKCeUsy+kNEP7ceWHzQ3VVOP5rlu63CMAnH4ejrP5iRmhF4 dvzYDjwrELmVd5GpnsC7oGLBzuhXqW0Wj3skU9Lpbk1gVgbE2lB8gt6VTgdnv85CNzhZ O5sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zPbBfYdRv19xF3sirA0d8CLfF89pzIdN85SmGePftxg=; b=okvQwXhPngcnS4CEQ/vtooh341V4q+3LNnbw2id9heTxgODXLImIsZBNAiwCG+qXbT bHDSzhI4sM+CXYB6a9/jPHmKVTjs1iHsQlO48LIw9o9i4juugmSzV+JPbVT/Ym9XXGI7 7XqF5dItUR8JUNDBeNea4lgz8wLJLYpwbaVPivMWnYgtYAx3r2vHS4D3gPZ/OeWo031i OHxYF7US2fq7ySxHROd3TbTFTsbjUYDVNaLdLgcJm5d2AJya/+xXe0d9quE9IfId5llo rnutl6+T4f+h9XPC6Mju9RfefnV+79GdXhw5Klp+hDke0B8RnXly/BHhLQ90PfPkL7sJ /9tg== X-Gm-Message-State: AOAM533rOms8BN5OuhsKTADC1O2JGHoFYIKHQlqKft9M9Q+n/GKj4bv4 hDEDDkIN4FlEeRftNxJfRvFRoNoUD38= X-Google-Smtp-Source: ABdhPJxS5krGkKOL06lGpxa/6QnZAbx/5eHMpXkki7Q+nr9lq4lbs7uOEirjOrUlFJs8mmDY0zAXBg== X-Received: by 2002:a63:1c18:: with SMTP id c24mr2139015pgc.30.1599122815543; Thu, 03 Sep 2020 01:46:55 -0700 (PDT) Received: from localhost.localdomain ([161.81.62.213]) by smtp.gmail.com with ESMTPSA id k5sm1840180pjq.5.2020.09.03.01.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 01:46:54 -0700 (PDT) From: Tom Yan To: linux-usb@vger.kernel.org, gregkh@linuxfoundation.org, stern@rowland.harvard.edu, arnd@arndb.de Cc: cyrozap@gmail.com, yoshihiro.shimoda.uh@renesas.com, Tom Yan Subject: [PATCH v4 2/2] uas: bump hw_max_sectors to 2048 blocks for SS or faster drives Date: Thu, 3 Sep 2020 16:46:45 +0800 Message-Id: <20200903084645.287856-2-tom.ty89@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200903084645.287856-1-tom.ty89@gmail.com> References: <20200903083404.GA2169202@kroah.com> <20200903084645.287856-1-tom.ty89@gmail.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org There's no reason for uas to use a smaller value of max_sectors than usb-storage. Signed-off-by: Tom Yan --- drivers/usb/storage/uas.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index f4beeb8a8adb..c1123da43407 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -839,6 +839,8 @@ static int uas_slave_configure(struct scsi_device *sdev) blk_queue_max_hw_sectors(sdev->request_queue, 64); else if (devinfo->flags & US_FL_MAX_SECTORS_240) blk_queue_max_hw_sectors(sdev->request_queue, 240); + else if (devinfo->udev->speed >= USB_SPEED_SUPER) + blk_queue_max_hw_sectors(sdev->request_queue, 2048); blk_queue_max_hw_sectors(sdev->request_queue, min_t(size_t, queue_max_hw_sectors(sdev->request_queue),