From patchwork Thu Sep 3 07:56:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 297743 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 0A959C433E2 for ; Thu, 3 Sep 2020 07:56:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B48A020775 for ; Thu, 3 Sep 2020 07:56:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RHtrNQNK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728015AbgICH4t (ORCPT ); Thu, 3 Sep 2020 03:56:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726025AbgICH4s (ORCPT ); Thu, 3 Sep 2020 03:56:48 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07E9DC061244 for ; Thu, 3 Sep 2020 00:56:48 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id k15so1622457pfc.12 for ; Thu, 03 Sep 2020 00:56:48 -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=snrx0dNGkfQ13DSaHbehNypGaEnu54r6TKdLubPoN6o=; b=RHtrNQNK7NE3uNrZPxj7MQgQ0EbK5LEK/748PQkluIquP/avxEZqgwr2oOMtsU+M4Q Q0mEPBOUUEphEuEUtXm1a7aYg6L7xQo/gxbXf0zAMZvTJtgRqE5nF6Zza5OQwUU19AUm 2v7MdJqEJvflzjCUDWMUzzUeCvkqOdDViakFnVDuhGYusmgkvNq7Cy8xDUlVMwT0tDjZ MGmPM2xZCp46mcc3pXewF43QzkOmV87p7FcLcwhc8KlsVyxxtxtw7Z8oMSJuMGejbVE2 GAkHbdb2NGMnrYyxTIg7EpjUIWCRtyQGVisexUi1/PstIyWQaTU62vOPiKoh0FJ9ttpT waaA== 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=snrx0dNGkfQ13DSaHbehNypGaEnu54r6TKdLubPoN6o=; b=ccV8lW0UVmSDX95YaRA3vtchgP+7E60AJZsNYK/rTaFrduGsKbffbdvoe0C51qahB6 eLoiZJySNoEikKcsUrNQuaQP0XqRDSIrYOCtuPBcdPvx5CNbqkzAcjr7tpX+fJh118JO HExQejGmhkkLMUp94txVx/IBwYFtMqMJVqNWfIXvCamzXRVMVwy0BCJ9Pnax9V8pd2lf wS2dIfihnFBDq2ZQ+yAUXjDGicr+m0pbYWothNN7bQEKBXl04uFr5vjS9AvgttuPqzIK 6wmuf00NCqbkQmBZUWgzN0gwdxD67aILyw2Ap/wpSwUMvjtNkiL8zGCz5xSyhdyapeOb UqCQ== X-Gm-Message-State: AOAM531mFNpois/yjT6f8LHRZNiUIPXnsiZdwC1+YYiSV2MQa5N4lr0i Ozjl5BNVPwQJtcdoXWe58FCXe2b3keo= X-Google-Smtp-Source: ABdhPJzQmf/IxTGS1ZBhS9ADlzpsLWOzHnqqGv2DC+lb0zAwWxm06HKm15TaqXdGeGs25QWgVave4A== X-Received: by 2002:a62:1c4c:: with SMTP id c73mr2726107pfc.124.1599119807128; Thu, 03 Sep 2020 00:56:47 -0700 (PDT) Received: from localhost.localdomain ([161.81.62.213]) by smtp.gmail.com with ESMTPSA id l13sm1787607pgq.33.2020.09.03.00.56.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 00:56:46 -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 v3 1/2] usb-storage: fix sdev->host->dma_dev Date: Thu, 3 Sep 2020 15:56:38 +0800 Message-Id: <20200903075639.31138-1-tom.ty89@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: 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 --- 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 07:56:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 258664 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 414D0C433E2 for ; Thu, 3 Sep 2020 07:56:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 142C220897 for ; Thu, 3 Sep 2020 07:56:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mAJjo+kc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728037AbgICH4x (ORCPT ); Thu, 3 Sep 2020 03:56:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728027AbgICH4w (ORCPT ); Thu, 3 Sep 2020 03:56:52 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 631F0C061244 for ; Thu, 3 Sep 2020 00:56:52 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id d19so1456800pgl.10 for ; Thu, 03 Sep 2020 00:56:52 -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=mAJjo+kc69gWKZrr1b6KSRXpirP1O/MXepRpBKj3aFSDAXhO0WmKgRiZKyJYBbKhVh JaRJK6xnlPWoUUkrZsNkdcHH+s6cls/lHNModRlUOwSqB8aTsw4UXIBE+O3sbJEjhRej TbVNCD+XvvHVjxBMIDlY9Ss2W80iJo4ZFTY4N2tslZH4liJ0TGoAcqJlvn30AW/jGLG6 StjNx5mMAUH29AfbR1+6e3ebWx5DuCaIgMEQAlMSaINICT2AUduqn9dw5/YxPBeEKq6b Wc/vVmCOx1ptVn+yRSlJSKKGdUmw2ahNUr+q4NB7j31eQj9bbTRnp+dQD5Xq42qBj+2h xypg== 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=eqLZ+b3JhYzYQInkuiwuv47T1UXhnQ2ZO8g4waEeKOGbmGi73UGldIKTc8KYptgnUH DMLtCRqJx0hCBn6vW5KIYOUqSqrYvFFmscRaWPbKkjfdiCjAE8NwQM7rZk+ajqnVE86D /cFregdarEhJXEgFDBnSayHrIJ4kji8MvWJsEAW/FlLvPIa7+NaTqGJYi6hAi6l28lff gO5NrxnUFhWHyrZKVuTyDhLcl5sgkCmkYoo5EOBAhPO1xPjq6dgD+5OsqwTOWHe1i+Zj H2hW3uDiTUE9+UikESltrlGrbSFiMDBPXnQ4F8w3PfFG9acj4lC1Sz17MLMT8gL9H+Kf AuEw== X-Gm-Message-State: AOAM531ga+PTIzV2WF0y0oXaX4B5GFf2l+grG6Av36M5oolGIyhceZKX 08bby49O3DRHxjJ9wD+m8LsG9YMoJP8= X-Google-Smtp-Source: ABdhPJyMlJY03nOt5KfHn5bgDJB0IkKUS6AgZeMLihKTbCU/QuWQ2ZBgoWbrl6uTzi/eLCEo6HwacA== X-Received: by 2002:a62:1483:: with SMTP id 125mr2681163pfu.186.1599119811636; Thu, 03 Sep 2020 00:56:51 -0700 (PDT) Received: from localhost.localdomain ([161.81.62.213]) by smtp.gmail.com with ESMTPSA id l13sm1787607pgq.33.2020.09.03.00.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 00:56: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 v3 2/2] uas: bump hw_max_sectors to 2048 blocks for SS or faster drives Date: Thu, 3 Sep 2020 15:56:39 +0800 Message-Id: <20200903075639.31138-2-tom.ty89@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200903075639.31138-1-tom.ty89@gmail.com> References: <20200903075639.31138-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),