{"id":811008,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811008/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1504790001-24715-4-git-send-email-bmeng.cn@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504790001-24715-4-git-send-email-bmeng.cn@gmail.com>","list_archive_url":null,"date":"2017-09-07T13:13:20","name":"[U-Boot,4/5] usb: storage: Refactor to use max_xfer_blk from struct us_data","commit_ref":"6158d0b42411165d34635a2ddfea17e12dce3329","pull_url":null,"state":"accepted","archived":false,"hash":"af8e235fa265fb46034912057e68c3a75e1b8033","submitter":{"id":64981,"url":"http://patchwork.ozlabs.org/api/1.2/people/64981/?format=json","name":"Bin Meng","email":"bmeng.cn@gmail.com"},"delegate":{"id":1699,"url":"http://patchwork.ozlabs.org/api/1.2/users/1699/?format=json","username":"marex","first_name":"Marek","last_name":"Vasut","email":"marek.vasut@gmail.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1504790001-24715-4-git-send-email-bmeng.cn@gmail.com/mbox/","series":[{"id":1998,"url":"http://patchwork.ozlabs.org/api/1.2/series/1998/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=1998","date":"2017-09-07T13:13:17","name":"[U-Boot,1/5] dm: usb: Add a new USB controller operation 'get_max_xfer_size'","version":1,"mbox":"http://patchwork.ozlabs.org/series/1998/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811008/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811008/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"T4Y7CC5C\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xp17946Z8z9sNd\n\tfor ;\n\tThu, 7 Sep 2017 23:11:33 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 47FC6C21EAB; Thu, 7 Sep 2017 13:09:51 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 365CDC21EB4;\n\tThu, 7 Sep 2017 13:09:20 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 5205DC21EC3; Thu, 7 Sep 2017 13:09:08 +0000 (UTC)","from mail-it0-f68.google.com (mail-it0-f68.google.com\n\t[209.85.214.68])\n\tby lists.denx.de (Postfix) with ESMTPS id A7A51C21E40\n\tfor ; Thu, 7 Sep 2017 13:09:04 +0000 (UTC)","by mail-it0-f68.google.com with SMTP id z81so888859itb.5\n\tfor ; Thu, 07 Sep 2017 06:09:04 -0700 (PDT)","from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com.\n\t[147.11.156.139]) by smtp.gmail.com with ESMTPSA id\n\tw63sm1238554iof.18.2017.09.07.06.09.01\n\t(version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 07 Sep 2017 06:09:02 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.0 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:subject:date:message-id:in-reply-to:references;\n\tbh=B0+/rkqn0Bpm+13xmVlr4DzVKre/BfGD+zKtbv+VboA=;\n\tb=T4Y7CC5C8wIfkTrrTEDnMA9MxxCrFRkSA74e/tkbnxCoarfCdlZO84cuEcAXZC2uJa\n\tBv1t/o7+HbagBjFEiMRp5NMKt5kkHuTPz89htRk92kYq5ZN3dNNHKYILO8NtcdfcqMzI\n\t60BYrx/E19K5qy+hciKQ26jXxx4maeHMdYXTG/WK3w6C0LeE5/TIgTrrBSpNzKMlFEeW\n\tfC/POb3Aanr+YNeQQYiqhYjnmM3c+guZpUzQJuETDFgOIlwicrcfDUWkt8dCEeLE+50I\n\tX27fp1ywIzhTiqropj2VJzv0AdkZYLL3ktsPvBXAEGMLCiFuz6zLlXcewpfxFQbrInxy\n\tTqjA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=B0+/rkqn0Bpm+13xmVlr4DzVKre/BfGD+zKtbv+VboA=;\n\tb=EUhJPPM+fruG/SGLNduA3HpxDiQtwhexQ4802l/Y2GUEI0yZ+hyRWKT+CWYdE7NtkF\n\tyvc5NV/vsr3ZtTCVhqv3OyR482+HPha2/wI69aW2ZskdpYM/8d0/OoXQiiO0YbAGLI+E\n\tIBkHwpSALNq+FRt/6Z5eVfcQYxmPSWcO5zzY9h1T7fwkBaelRjGV7U+dGFW82ni1spzl\n\tK9eucHmSQqFLsHJ/sQ/QK7CghgqJqKw1rqBL1S+eUsrC2YIRkwby8HBCigM6d9HR9qPk\n\tA/RUPwQKRLq0NnXBpFZ0TB2dS/ZQNL486+gCK53wnQ63BOOXd9G/pNj/nd0RDIXtBOx6\n\t0kPA==","X-Gm-Message-State":"AHPjjUi2Dp8dyPBeYOrxnh4Kmf0TzW7IkfWyn9CD+RCyH1loDvjJ4cai\n\tVjX6XA+07jZXog==","X-Google-Smtp-Source":"ADKCNb7GgTN6ViAMphOVPuQQxPYxL4WQMTRlPi/+maWxOvySQZirj6ZpTzsSR7CwQY3f89b6FTJnCQ==","X-Received":"by 10.36.92.10 with SMTP id q10mr642343itb.145.1504789743364;\n\tThu, 07 Sep 2017 06:09:03 -0700 (PDT)","From":"Bin Meng ","To":"Marek Vasut , Stefan Roese ,\n\tMasahiro Yamada ,\n\tSimon Glass ,\n\tU-Boot Mailing List ","Date":"Thu, 7 Sep 2017 06:13:20 -0700","Message-Id":"<1504790001-24715-4-git-send-email-bmeng.cn@gmail.com>","X-Mailer":"git-send-email 1.7.9.5","In-Reply-To":"<1504790001-24715-1-git-send-email-bmeng.cn@gmail.com>","References":"<1504790001-24715-1-git-send-email-bmeng.cn@gmail.com>","Subject":"[U-Boot] [PATCH 4/5] usb: storage: Refactor to use max_xfer_blk\n\tfrom struct us_data","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"This adds a new memeber max_xfer_blk in struct us_data to record\nthe maximum number of transfer blocks for the storage device.\n\nIt is set per HCD setting, and so far is to 65535 for EHCD and 20\nfor everything else.\n\nSigned-off-by: Bin Meng \n---\n\n common/usb_storage.c | 49 ++++++++++++++++++++++++++++++-------------------\n 1 file changed, 30 insertions(+), 19 deletions(-)","diff":"diff --git a/common/usb_storage.c b/common/usb_storage.c\nindex df0b057..957ccdb 100644\n--- a/common/usb_storage.c\n+++ b/common/usb_storage.c\n@@ -98,19 +98,9 @@ struct us_data {\n \tstruct scsi_cmd\t*srb;\t\t\t/* current srb */\n \ttrans_reset\ttransport_reset;\t/* reset routine */\n \ttrans_cmnd\ttransport;\t\t/* transport routine */\n+\tunsigned short\tmax_xfer_blk;\t\t/* maximum transfer blocks */\n };\n \n-#ifdef CONFIG_USB_EHCI_HCD\n-/*\n- * The U-Boot EHCI driver can handle any transfer length as long as there is\n- * enough free heap space left, but the SCSI READ(10) and WRITE(10) commands are\n- * limited to 65535 blocks.\n- */\n-#define USB_MAX_XFER_BLK\t65535\n-#else\n-#define USB_MAX_XFER_BLK\t20\n-#endif\n-\n #ifndef CONFIG_BLK\n static struct us_data usb_stor[USB_MAX_STOR_DEV];\n #endif\n@@ -949,6 +939,23 @@ do_retry:\n \treturn USB_STOR_TRANSPORT_FAILED;\n }\n \n+static void usb_stor_set_max_xfer_blk(struct us_data *us)\n+{\n+\tunsigned short blk;\n+\n+#ifdef CONFIG_USB_EHCI_HCD\n+\t/*\n+\t * The U-Boot EHCI driver can handle any transfer length as long as\n+\t * there is enough free heap space left, but the SCSI READ(10) and\n+\t * WRITE(10) commands are limited to 65535 blocks.\n+\t */\n+\tblk = USHRT_MAX;\n+#else\n+\tblk = 20;\n+#endif\n+\n+\tus->max_xfer_blk = blk;\n+}\n \n static int usb_inquiry(struct scsi_cmd *srb, struct us_data *ss)\n {\n@@ -1150,12 +1157,12 @@ static unsigned long usb_stor_read(struct blk_desc *block_dev, lbaint_t blknr,\n \t\t/* XXX need some comment here */\n \t\tretry = 2;\n \t\tsrb->pdata = (unsigned char *)buf_addr;\n-\t\tif (blks > USB_MAX_XFER_BLK)\n-\t\t\tsmallblks = USB_MAX_XFER_BLK;\n+\t\tif (blks > ss->max_xfer_blk)\n+\t\t\tsmallblks = ss->max_xfer_blk;\n \t\telse\n \t\t\tsmallblks = (unsigned short) blks;\n retry_it:\n-\t\tif (smallblks == USB_MAX_XFER_BLK)\n+\t\tif (smallblks == ss->max_xfer_blk)\n \t\t\tusb_show_progress();\n \t\tsrb->datalen = block_dev->blksz * smallblks;\n \t\tsrb->pdata = (unsigned char *)buf_addr;\n@@ -1178,7 +1185,7 @@ retry_it:\n \t start, smallblks, buf_addr);\n \n \tusb_disable_asynch(0); /* asynch transfer allowed */\n-\tif (blkcnt >= USB_MAX_XFER_BLK)\n+\tif (blkcnt >= ss->max_xfer_blk)\n \t\tdebug(\"\\n\");\n \treturn blkcnt;\n }\n@@ -1236,12 +1243,12 @@ static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,\n \t\t */\n \t\tretry = 2;\n \t\tsrb->pdata = (unsigned char *)buf_addr;\n-\t\tif (blks > USB_MAX_XFER_BLK)\n-\t\t\tsmallblks = USB_MAX_XFER_BLK;\n+\t\tif (blks > ss->max_xfer_blk)\n+\t\t\tsmallblks = ss->max_xfer_blk;\n \t\telse\n \t\t\tsmallblks = (unsigned short) blks;\n retry_it:\n-\t\tif (smallblks == USB_MAX_XFER_BLK)\n+\t\tif (smallblks == ss->max_xfer_blk)\n \t\t\tusb_show_progress();\n \t\tsrb->datalen = block_dev->blksz * smallblks;\n \t\tsrb->pdata = (unsigned char *)buf_addr;\n@@ -1263,7 +1270,7 @@ retry_it:\n \t PRIxPTR \"\\n\", start, smallblks, buf_addr);\n \n \tusb_disable_asynch(0); /* asynch transfer allowed */\n-\tif (blkcnt >= USB_MAX_XFER_BLK)\n+\tif (blkcnt >= ss->max_xfer_blk)\n \t\tdebug(\"\\n\");\n \treturn blkcnt;\n \n@@ -1384,6 +1391,10 @@ int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,\n \t\tss->irqmaxp = usb_maxpacket(dev, ss->irqpipe);\n \t\tdev->irq_handle = usb_stor_irq;\n \t}\n+\n+\t/* Set the maximum transfer size per host controller setting */\n+\tusb_stor_set_max_xfer_blk(ss);\n+\n \tdev->privptr = (void *)ss;\n \treturn 1;\n }\n","prefixes":["U-Boot","4/5"]}