From patchwork Thu Sep 12 04:51:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Yang X-Patchwork-Id: 13801359 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011019.outbound.protection.outlook.com [52.101.70.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 815FC187336 for ; Thu, 12 Sep 2024 04:50:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726116661; cv=fail; b=fgnBf0ITPrTCDkEZ4tbyVozhE3LjL3m2MBvakAuo2lHnDIfd39BR365MhG874h9PgY7E5a1m/CFLlMZOXZiOZaLaFbClDEHRU2WVGhk6S+gXUUceuaQhnAZx+dPGlYxZyw7rMik477svF1j/4s8yWXsEqC16er7HbiTK9s/wOn8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726116661; c=relaxed/simple; bh=64uaUdVB0PGjBAoReMNuUQ9/L0jOpiJWfNi94pxEDP0=; h=From:To:Cc:Subject:Date:Message-Id:Content-Type:MIME-Version; b=h0fQ/QZp5iVh6CI25MCW2RIhmvu5g6HV8v1mp16M1Q9ZuZWs+T+QnX3KOSOmth+jSxnphdVpK0fbDQWr/xuukvv5iBHngYRQMhOPlR9t0CYuPMhGnGx6ve/Um56fL1qzaQrkfhqhpaxG2CAZBdmrzxDco3uRaKR4qO7SuVj1pLA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=hedBN14S; arc=fail smtp.client-ip=52.101.70.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="hedBN14S" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A5HVhX1MVLkXVsIFUrKYEkppfnMT3MvPGftsXMtGmd/ZWmvIaChFXIZ1AT9vi6olYQKnOUHVC0BtEBxnHPt9JslQUKnRqavtWYor5l7ayN/uzn01YHIQAywzDIig00pY3Iy6cjnHBaASmm82yK6M/jD+floOXqkz3MrkyYDhV6tAr74UPune5gdHze7t8TKTn3ocitoUzC5/9r5uBTsSvXgxMTgIAVQmZsHtJDDWAEFYVxEpmzvpeZ/OvxmTE25UBLcGTzyY8SZ+sHjwWl6mlbaB4MZ7Eh0qFvQUaa0ZS35SrUjSKlpeR5JdDCYKvYyT4DbkTLF4+YIWhtvXM+l8zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NgKeVrnM/D9m0PXw2zi20j3/tMJZDDc4aHy8DE64DX4=; b=Bj8NtCtp/wP7BtIhk/ke3N5kLYH6xWLhS4ZidoUsy+X9fLhmrxrGemqomEGPfiSmWXbGe7NQT+WErGFJ5FIP0Ellb+KMK8gkLNnkC1D6FmtHy0NoVpIu6NtYr9DYUX1rjZo40EAEAVyNFsot4gl2mx9PJ5wJNNu8FmauhwUuCCqSSKUdym0S5Q16dniviXqOmxUIbUFCh1zqDn386YFgq2VOwF4uTWu9ruGuFOVZNHSy69FTLJbUizCkp3I4JP67Z4tYPDjq3q0KuGOQmuT5edz1WqWLODO/+4+Ewo8bWZdZoWuhkZncE85g3VEurmZxCdXXW3JHNr0iSLoSvPAlYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NgKeVrnM/D9m0PXw2zi20j3/tMJZDDc4aHy8DE64DX4=; b=hedBN14S8g/mH5xxAzAmIZ3RhHqdnnZo4Ms+hoyts3L545e6BURRNkBB/0V5bfKmBAab7g+FidyUiuch51a3NuwTda+mxUMzsebYq7EgpN267Ib8QxZB03eKVz0nBJKu2+ibxcpsiFjodPHXgEdiGtSPqNpzggNmvvp8mH1pf3L7eY3DPDYEO8BZQ3xNry7kP2QOABdJMWHahuAguq32bkZEEBtgnxeEMDDIBzlbEFs/WtRoIRaJJ+a/PxzggN8v/z10VmWH6Vupp+vN7k0g7+aml3zRX/XzRpfnLyMBnoSYYpCtK9FBk8OBipiy1r/nUkxUyAc9qzTu4U4SjFKyyQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) by AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Thu, 12 Sep 2024 04:50:56 +0000 Received: from DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7]) by DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7%4]) with mapi id 15.20.7918.024; Thu, 12 Sep 2024 04:50:55 +0000 From: Xu Yang To: peter.chen@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, imx@lists.linux.dev, jun.li@nxp.com Subject: [PATCH 1/2] usb: chipidea: udc: limit usb request length to max 16KB Date: Thu, 12 Sep 2024 12:51:49 +0800 Message-Id: <20240912045150.915573-1-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8822:EE_|AM9PR04MB8555:EE_ X-MS-Office365-Filtering-Correlation-Id: d7a6e1e6-13a6-43e0-90dd-08dcd2e67cb6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|1800799024|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: A3uFSBcA+nkVFQ3LpB2OIex1IYqcgwMI4IbYo4PagIRZkj1nTIv8/dg9XOwvT97AIgm/7TzxecsdiJTqTY+8H32ktzkmfE41bYWoeOUhASKXMJ4IAACCNjcvcCW2yJznIgmqBZdtYp8uRnmfcz32jkh/+fvoxIT+vaRE62bg10Xyj7RRjhgiUTfXIPUp/Q63JlgOhRCfyoW3LFklbSKFG1N5Z+5qa4J0ajsg0b4wjC8mlCKcEQ1fjdEfDH9f+8rNgYZQGFaMMU5foXToFtzGHxup4RJ6CRKq+F9gKOgvaBrHhqwE62ABUOpJiMnuzy7bODNpaqmTcfg3j3shv3dbw1/rA2Ynzbq4IcI8pWwq4eOnNMKvK6NdWYmeWNyl/oKIpwIGGDiY6m8Vmsls/q/zPh4E7BxxziUxH6DjBRL5tIAYecmsN9zkUEKvs0OJCIN5VQy2fdxv03YoinfBm1xhReeKlIBL88ytDMnFR7+ks9ySHYA71RWNS5HzJE2/d6wlmWnGo7N+uQkUC2CEKLcKCTNo6uFjFQDHy2YzwK/WGqVXCM2epQxLpZRAtrf0r9fzaBxl1749bhWZTGTXb5iUEpU8Ay6ICCr0ihQ45VsI3HXd1Sr+pGINHEXukWwXXqs7s+I02yyXSnVEP2MPnXHw3zuU+EcKLyeQngJRlLW/UYLDLCLQQ2axmXgLxk0X1RfzAunGqi8eXYDd5CXSNoDkz6DoTH9vSqbSswUd/5qUza+lBiusrXi0KCHLr72ODw4sLmJzXH/p+V0Dy4ODjciRuqIiPDwOjFCM0Oi3Xy5A6uzDiTQNIVMIc+P4ZDESafCjHH3AHFj0h+7Sk/Ejj4epA3aPpKjDjQEKGnWvcZA1w4ta7UYBLCRhbiMljiROn+V8GJILpZW+pgLf413adxGgqcI+CMlW7oZxEzh0V8KxeA5+lCWzc/GF6XBhQA+1+J2GYIeQ3lNJ6kVDNbc1fqJOvxGwI/agqbCi4Yzzr8UwvYyi5XcdaP1hVs0yXTvvevFJfh03CKtLrCCkNGJOCM3TefJb5iuF61wW34JncU9Hzed7IzmjA0CR1X5+H1OAbAVkddg0ywKVKMyhblFedXcxFzAoXk/5E3W9rZMRnH6IzpzZIf0WkgtANL5AEQO+csyXCI1GQcP0nTOIcV3FEWqud2iVljtoTR/nDPttGTsMJ1yeE/zm5AqUPgRdrC0uKZSTDFQ3eWtlscx5ehY81u3V7XVBGbRtiPEWrYBTi38gHv5d9ybY5iaEw0C6rV355yxZq5cdeHIbvNguC9JivA3UijWWzCckX0gaEtJZqb8rf0paEt6gKq7TPw8Fmf0xB/xIbMoXfdy+D8IkcIPKeHzhK4GcV6nRH6O5uuxU95WWXGnXj33HseOqWqFVDPp5gmDBHJvdTz6lS5rHzSyzaLiAog== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8822.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(1800799024)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 78boesSlgA8Ove0IRp6Louk5Xr71jcuva417Hd7sJRkO9piuGolO1Qs700AQIccy2tfJ+U7W+Er7wqpLbnQ+rgZT331wpGJ6Auanv75eATw0FIWZsHQewT8BGGvEgLqHwOt4V3HKoKKLHyvgNKxNX3SN5qumSboyx8XFQsRyRONPcTvghi1SGfRdqKzJrk1k/hgnnnHrxGS5dkwlB+dYH1F4tMIQjPcKt6yZ6hbUJxPu+VAXmK+nKj8h0vF24jSYyx35jFkoyiFEsgKTUwRXDfPcVIzAjlVtwM9Gl85ogRmGVKXbrED5R2PJ6xppQnOm/w7WNdLlvmRoRRAeK9YqHupwa0w3Wxsu55cToMCwWmIl1Yrz3CcMkBqKmJrSud+fx6ZofeUk49JLvJVTGDFbCZKkzT/WiK+VHMoXz4Hy6jLVYMTy03LRMqaZlB73CryRfV+ETVBL9A1Q60TpHWgkImv297pHmJgTGpi/kn2I5PymBa8kb5D73pET8DCM2yoQ/dsG8FSMb3ZSMfPY9qL5RM2NlJ1ATmBRM0RRiIjDMa2M2ZTZSeFxy60P7DY7vWwe2dppZ9186XC2UtS7aAGpn/BInLAGzd6fXIb4nDNHZL+HX1JUKeYJ07EmsM9k052il/rf4pz1DiBgszlbvINZMRFzf06S2JugqWTD2TkfxZCKnfPoVpe3ZYrOQNMbmpEPdl/fscl7x4Gx/RZ3IpFxV3YOq4smsbuduCHIla1eV67wAbmpTmqxJV7QgXQv9YZba+K13zUqU0HPS0CQmpIjUoyNlVr9CDIv0j0FU5K9R6ActoY7KW0iY6gA42oip765alt1qWll4EZbWwNXpyaYaWxs1/ycdUTB5Jk1YAQJiI8O9aIfuvrjFqHakjbBr5G1uVtb1FxSNCdYfLVHOxgUeazPjDZxDG3NNQ2RTlD+KZrIIrsT6zVGpcJ9ikFOrPXsF9LT+Ln8RCxoBuH/eE03s8kBXoxi6dpbgCbXiePSnleolXWrrUkawB801rAxu34eCSKpRshXfguGha1/T824cPMUAbVm6sEP6Q9da5CljlUvylmpq5Akl8f74/eMXQVVy3rGVvb5MnLwX12VQnfpQJdlTCWThy4LQ7GsKjC8/HDPtVVfWbOM6PyP5m8PmustX3ukhjcM8cZjLvCZ9J0MNNFQ+ss7oyrn4Nk8n+XuEVVbyCeBDsOfu1xibkPtdGYURDb09W75mlIy3n5Unhwn3yThEEQPl573qwhLWu6WRraplHxUxIw4OsEbBKvnDKlDT2X1nY2y0ovMK+bk5XxvZ01bBV42aTFu3jiqdpc/0zbVHk6AisRQcLolyMh6dyCL15bau4YvJ18URrVDCuCpiKl7zkXYA7QLr5WMrZtzE1nOwW21QYnKdxgr459vrnRHqeesjfvRaTyt5DoLUOpfraAqI7kjuoVC20zfVb9U7HaMPB/D+uWyWM/eYK8bs26/0OlGOrsgYevhj0c61fymzGY84c1EX9p1udDydc4yAuAYpYrF3y5oxCBt/ay3pa/NCJxFFuCXel67NQrd7ARICl/Artbqtn2xIz/+2b/GHz8p6NjK1lKpLzlxYSuwVC1M X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7a6e1e6-13a6-43e0-90dd-08dcd2e67cb6 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2024 04:50:55.9007 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kaQKQk00kT1wS6cSuvPtHSrvIsS/YnRHJYHik4CrM3rzs15Tpx2Gunvd/Z74vwTyttQF8eHjw280WRcFcqJVgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8555 Currently, the deivice controller has below limitations: 1. can't generate short packet interrupt if IOC not set in dTD. So if one request span more than one dTDs and only the last dTD set IOC, the usb request will pending there if no more data comes. 2. the controller can't accurately deliver data to differtent usb requests in some cases due to short packet. For example: one usb request span 3 dTDs, then if the controller received a short packet the next packet will go to 2nd dTD of current request rather than the first dTD of next request. To let the device controller work properly, one usb request should only correspond to one dTD. Then every dTD will set IOC. In theory, each dTD support up to 20KB data transfer if the offset is 0. Due to we cannot predetermine the offset, this will limit the usb request length to max 16KB. This should be fine since most of the user transfer data based on this size policy. Although these limitations found on OUT eps, we can put the request to IN eps too, this will benefit the following patches. Signed-off-by: Xu Yang --- drivers/usb/chipidea/ci.h | 1 + drivers/usb/chipidea/udc.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h index 2a38e1eb6546..f8deccfc8713 100644 --- a/drivers/usb/chipidea/ci.h +++ b/drivers/usb/chipidea/ci.h @@ -25,6 +25,7 @@ #define TD_PAGE_COUNT 5 #define CI_HDRC_PAGE_SIZE 4096ul /* page size for TD's */ #define ENDPT_MAX 32 +#define CI_MAX_REQ_SIZE (4 * CI_HDRC_PAGE_SIZE) #define CI_MAX_BUF_SIZE (TD_PAGE_COUNT * CI_HDRC_PAGE_SIZE) /****************************************************************************** diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index b1a1be6439b6..5d9369d01065 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -969,6 +969,11 @@ static int _ep_queue(struct usb_ep *ep, struct usb_request *req, return -EMSGSIZE; } + if (hwreq->req.length > CI_MAX_REQ_SIZE) { + dev_err(hwep->ci->dev, "request length too big (max 16KB)\n"); + return -EMSGSIZE; + } + /* first nuke then test link, e.g. previous status has not sent */ if (!list_empty(&hwreq->queue)) { dev_err(hwep->ci->dev, "request already in queue\n"); From patchwork Thu Sep 12 04:51:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Yang X-Patchwork-Id: 13801360 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011019.outbound.protection.outlook.com [52.101.70.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF9F218859C for ; Thu, 12 Sep 2024 04:51:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726116664; cv=fail; b=pTAb0v+HaW50TRui5KAWWWM7ln4PvcJjLtdyj3u+iduciW5m7Srw3ot3XyL+QyUe0W01+uqYrq31WoiF4K3VyrTBEw7NgysVg1KN9zrbRqcxblaZg2AZrfcFKEEGnBqP/HXmSwoU19rvuczWteCYaZM8MQaW50leDCTcaI5Kcfg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726116664; c=relaxed/simple; bh=VRMoQRNg8U7c6Z1LmhaWctfO53jtbg/vkeBxouMuWQw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=TUIW2/8WiCGWtfkTUBvISYW93ym9kig8TKy/VB6nfdLPqtDoRZzT/z99pHgM2+Xyy71ewmNmp5p5RPNLq0DEfLAhUj+EWMHCFNcyKDzS4O0dE9808pRVHtMbdG4TD5X/k9qknB6fxfpDB9cMS/N1Ba8KMvInzyIPAGP8FnIKhmk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=PfI69A0T; arc=fail smtp.client-ip=52.101.70.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="PfI69A0T" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RDzK77iMJyoLd7eYcRk+7dChdrYCYIy2I8GusSjloJhEg6rLXGfk3SHA9cUGrEWTc4Z6/cfK5gzm8c9//3eyVUTh6qNZizSqwpvWze9rT7b0UkdQeJF0XheSSLtYYW/QAD+DBp686ev6/Py/vjoUaBSYBqWkn0tOSxTIH187byWyZJAV9JFEipwwMe7C2n9w7UkZnW8BCJwD64Fts3jrfg1SExBWLn5N2cKyFeyjRbUT3JbkfajnO6Cz64R1BprXZ2trSJDdRyDb+nfRNFqFVqdfPkanixaOiuyyWFUtkoVSEvLgnqKK8ZAXK/fGz3R+hEmIPPENMKVpyYc8Y22AzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eoXxw0d4hV1AU0N4blzSjNRbpVnro4J+x0yHJpEQGh0=; b=fkM27qt5DwS1DdH7bNos9CaXimRAFjQvTjXXdNrBxkWc5GgEL0skdPbSQOEBedadn8WHg0XCAqOWf0UanDI9gvVS5MLQfyjT8dyxKdfMetGsIHh8cGE6B19IZy93KWTel71kshXYgbq7wI9uR7OLbdfMOMlkYeA0Kxr4SI/6wdMSQC0MNAAR+jAfNjIKsIoLj0ybaakX8kGiyOVvPc0xbq4SF1av4s0296BWQFdXVDUt/CXNi6x/QD0ZNhxtzXpD3g6Qj9HbZ4AQTBArhBNLQI2iLmx7F5YhY/xZYc9XBGdpKYbxpRrqDd0sl9nORiAXlQQ4gTZJjIc7KqgLHOrnAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eoXxw0d4hV1AU0N4blzSjNRbpVnro4J+x0yHJpEQGh0=; b=PfI69A0ToRm/vaKIRibbyqltzRTYJmNvfhHmDlMfInwziAg+K4VnJMTpXqtlg4BBXVqHg/56znqTO8VackMeQPVJaKt99fQHV801tAVIJy7x6QY+9vNEDzzAA2rym+/EFIhLhnKMRMdc8wToyt8yd7OIYXIeoOkHs7uozD3RwtXqDxFO5CkV0nMmf/ykcYnnhUFuQIUd8lnSElsr/aQ8sWISNrKRCCscgAsdC7guFyflL3NTL5kYLK1DuEXHnZeGoUEwdhx7EAPEqTNrmVbFCIDxIEEeyNm+5bTPpdhIYl/z4aiKapaZ/TKESzBKij1hX2tiyWGkXpWz8Rl/dkisoA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) by AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Thu, 12 Sep 2024 04:50:58 +0000 Received: from DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7]) by DU2PR04MB8822.eurprd04.prod.outlook.com ([fe80::4e24:c2c7:bd58:c5c7%4]) with mapi id 15.20.7918.024; Thu, 12 Sep 2024 04:50:58 +0000 From: Xu Yang To: peter.chen@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, imx@lists.linux.dev, jun.li@nxp.com Subject: [PATCH 2/2] usb: chipidea: udc: create bounce buffer for problem sglist entries if possible Date: Thu, 12 Sep 2024 12:51:50 +0800 Message-Id: <20240912045150.915573-2-xu.yang_2@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240912045150.915573-1-xu.yang_2@nxp.com> References: <20240912045150.915573-1-xu.yang_2@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To DU2PR04MB8822.eurprd04.prod.outlook.com (2603:10a6:10:2e1::11) Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8822:EE_|AM9PR04MB8555:EE_ X-MS-Office365-Filtering-Correlation-Id: f6498d79-d345-475c-1c98-08dcd2e67e09 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|1800799024|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: aFalthhhvtfyzcZSfrPHXV60zWXnzJhTPNaQi6V4nNo/YpuglMRzEeuQdtxvvKbRPW/stDhaK9FXPC1NDJ5Hz2GJ4ara55P59vgdAhmhVGUz1zJQVDx8VEDfzpsCxAGs7Dw0oSL524iVwP4XKtptGrluzfiP/VLTuaghd1Q6kK0RWxvVogMSYyIIK8p7pkXvlmkDXnQ/gl73M1ZSvw+G12Rh0fFKlRdD6/6xM4uMD7abB3NUrUOx5olHYCwrgyvH40tbn+w9xMaABE77ae+3u4eekp7AOPvpxDh6doXVHFhR8k4YCGtq/ApU28nmvL58sBO43C6WKq5RsFlwioMv4BEr9iPIPREcGLZ8O4pu89cN/xfoGbugj2uWCZU/xyPUd/h53fopgwkkgjCXQKTVATZTwsjjFnABApeiujPPjxOwO5N76yR8CmuTqa6ylhBeio3Jv5xIIWTH3uAgC078nT9QzXBrrFrOkgKKnVwYsMBaQGF17GQa639j8Qm2RDdyNhmxgYje3ewpnLJAUEvAiZVUlwpfSNC642brw1buFOXTc0oITjL02riLD7y9tpKMDwBolucyhBE6eJ3oNEMZnVr98UMri1MXwVeJh8AWNy6IXIpjiBaW0oVLdR/gowhRcbjmAYRWoGmyaO0UHGua2pvNrRFz71wmoXNJmjlmd4K40vG/3cIRAAceWvbFXYSCuwdTGaXdKWkU9nPw/GRpkW4PBpqfycKMeuv73bWpHivmeUGCCQg1q66caawy5bGRnd8E11oyxhKoOgmGc+1KX+R29JQSP1ky0xG/vBfICI40H54e41QHHDjz6kj8GLB2d/4luNH2nIUYHiMyYTQrdCi2Jyg0YMm4+geXkZtnzv8BqRP0D5UCGJhpDmsI8uT22zM8X4uU6PV89mIDd7iEc/ZSwhMw+FyXnSz+UWWcaPA8W0nrnORoWulBQeuQ5leWqUlcyFstMmXSvfOwqxgZVKv27EbLoYuzV6O9HhR/kVLn6//7tJlEAx8qGzjYfJ86j0jOyF+e8o1auLyaUKYAnQWDGeIMQnOmRQu+xwPYzemmh0b/y/G4Doj+xhiTdpvSrHZqNENkT+69hKuSgizVtTnkgMcPyAHW4jiHYNbI0kXtZ9soAtttzWftT5xG6aAsjnAHwwFFADk+TFAR+CeyZEDkqa7rE5IdhygHSTIHheXYeKPHXkbc4RRbUDDLZNGX8cC2A1/PpRRq0ia1vCKJtsD4XrssHG6fO/UcmyzSyU+lLtmdySkeUKlcmwZ31Wwb0+hRPAuK3A3X2nxRyRQPGQP1fEpaB/rIQcvUFx94DxLbxBxzUGH8It82JeUsLGMJn8sxxQy85qGV3W3Pjjt5fZwee2kOtxRo7zKWWdXclJ0ai2t8ibSv5KaC4Fa87UooRh8tW1WhN+Pow4CjDPVj3Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8822.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(1800799024)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5cX36YJdSn4RILW+DiWn1epKD9P+e+uhfsRvK6kClWB4ZFKezg+9b2qJz6FwiPLack+uaBsa3ETCioc/GyY2FC4gMEcSKKZAvNe4ChzczFCPSta0siRCDKqQFGfUg3KgcOH7P3z0MqF0yRvwRzD8dsi81uyKx8Z2lJwZKBctRElv0SxoQMQ9FltmPN631qr55LPTWJW1HlHnFFSKXPBqE/pyCbK346CSh9YgvK1Fcc2YatzMKykC4fYGCpRXIMQkFmzOA88EwcbEg4axUSMeXcGIvZN9MId+9npsD52V6jrduAxgxxEe0vJ4IGx//s/yN3MU7olMowUJjxLi7pGNr/AqcupD3sl09jSFFYuNMtWf/MTW0muNk8G5mCK2s1Ck0itAZynE8r4fdUgvDBP5b5s6TYjv3Wsym5wrd3rJablK6RwUEI/44fmo/9w1YWiWG2y6ZhTc77/m2xQ06Y/g//IcZkazrFP85aROTE3ep3gvtvheQDCDgnORwtqd/Sl2obE32GIf0Y5TTgDOooJf7gAH4khNO8puZGkiivEvu6tpczFxRAOVeRZO4hS6lwtAYfAS54eTBRaIOgnTbdUQH8KEGHj4UM8de4Uotwg47bmrDj4agC1QcKUG6C+KLsvhNwkTTTrqVup3CCuoQbdjXz75bfsOdWOwY5ymYSMZoe/tPP5hBDRjvbDY6TwOhKGVUTLSn4uULDRBqmJiy3UNNZ/UgTJg6NV8v5AcJppTkd9aG1icyo/0RE9HD1NaJ4rYZAvANrA3s3BWmpB7qzkX+Ga6IIENlsGJWYxIS+Mh7zwxC9kJAbdZUjGabauBRxX3l+1y/3eA5BjeCkxpmmPVwSVIuEINoVRERSSfa+9uG/x62IcDjBOLQ3X0r0SeVJkMEpXwhl10jnO7Ccc6niJICv8l/NkZt39fItfV0CYj8bp7xTW8vjz/YM+BEf7RhYcdTQYCwkc6cgQHDFtUlAypfS2PcKJTjIG/kJdPJdDp4cDWp8P1iJ1TcL4NzzKo0P0Wi5f01GxkoWaJmtl4i5le6uRNj9HJb6e3o5bUsrbGTRMy9T4JjQuW2S2TrxgLQtMw11oC4c0KQcSLIRoYDW3zQwzoxVFq/TKSHZO8qkUEH2Ysz+qd0R9XrOSGBKbX7BqOkCVlXC4Y4kANykPbMNXUFPhUTNhIBOdtWFm5uC7oT4vUeLLpEo0RekP5KAUNHWN0hx8H8tKHUtbdcCIIIiRWAhn01H+7jKFKqqsBRRLRi2By5Fo/9JYlW0jnCwRG6F2QpmNdLXw6eXutIP6LtW4aRo0sz7cwWc1FEniQ0qpP9KA7ih8zGHINBlQ6F3D4cTNEXpL3aScb7Sj5PDcGRgmCSU5DePTVFcrXROfhUunGINFWx9l8bDLlcuMa1oqzh5906VouQRO+mozKF3d4QV7Oc4c5UH0tKI0JRPmsHGcBPwpJnu54oMxwsN5bkLfYSZODJjtzhn+gJr9cil3N1QI81tUtIk8jRo8LrMqf7Jcnv3KPZNKzAlfzHWpzK9UkbCMfIAeDu2BRyDqw09mXlRcavMoX4Qr5r3Xg6wwFVsYeryYOUUoTF3K5JNC0boCS+0Gr X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6498d79-d345-475c-1c98-08dcd2e67e09 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8822.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2024 04:50:58.0223 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ISw33SJPP8AyogwCrEgIk3/TqVdizTq4o6EpGveUMKfjzQ36PEx83EAfIQyJ/6ASX4DI0uP4dORELHD8CDg7Zg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8555 The chipidea controller doesn't fully support sglist, such as it can not transfer data spanned more dTDs to form a bus packet, so it can only work on very limited cases. The limitations as below: 1. the end address of the first sg buffer must be 4KB aligned. 2. the start and end address of the middle sg buffer must be 4KB aligned. 3. the start address of the first sg buffer must be 4KB aligned. However, not all the use cases violate these limitations. To make the controller compatible with most of the cases, this will try to bounce the problem sglist entries which can be found by sglist_get_invalid_entry(). Then a bounced line buffer (the size will roundup to page size) will be allocated to replace the remaining problem sg entries. The data will be copied between problem sg entries and bounce buffer according to the transfer direction. The bounce buffer will be freed when the request completed. Signed-off-by: Xu Yang Acked-by: Peter Chen --- drivers/usb/chipidea/udc.c | 147 +++++++++++++++++++++++++++++++++++++ drivers/usb/chipidea/udc.h | 2 + 2 files changed, 149 insertions(+) diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index 5d9369d01065..dc4dae2c31b4 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -540,6 +541,126 @@ static int prepare_td_for_sg(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) return ret; } +/* + * Verify if the scatterlist is valid by iterating each sg entry. + * Return invalid sg entry index which is less than num_sgs. + */ +static int sglist_get_invalid_entry(struct device *dma_dev, u8 dir, + struct usb_request *req) +{ + int i; + struct scatterlist *s = req->sg; + + if (req->num_sgs == 1) + return 1; + + dir = dir ? DMA_TO_DEVICE : DMA_FROM_DEVICE; + + for (i = 0; i < req->num_sgs; i++, s = sg_next(s)) { + /* Only small sg (generally last sg) may be bounced. If + * that happens. we can't ensure the addr is page-aligned + * after dma map. + */ + if (dma_kmalloc_needs_bounce(dma_dev, s->length, dir)) + break; + + /* Make sure each sg start address (except first sg) is + * page-aligned and end address (except last sg) is also + * page-aligned. + */ + if (i == 0) { + if (!IS_ALIGNED(s->offset + s->length, + CI_HDRC_PAGE_SIZE)) + break; + } else { + if (s->offset) + break; + if (!sg_is_last(s) && !IS_ALIGNED(s->length, + CI_HDRC_PAGE_SIZE)) + break; + } + } + + return i; +} + +static int sglist_do_bounce(struct ci_hw_req *hwreq, int index, + bool copy, unsigned int *bounced) +{ + void *buf; + int i, ret, nents, num_sgs; + unsigned int rest, rounded; + struct scatterlist *sg, *src, *dst; + + nents = index + 1; + ret = sg_alloc_table(&hwreq->sgt, nents, GFP_KERNEL); + if (ret) + return ret; + + sg = src = hwreq->req.sg; + num_sgs = hwreq->req.num_sgs; + rest = hwreq->req.length; + dst = hwreq->sgt.sgl; + + for (i = 0; i < index; i++) { + memcpy(dst, src, sizeof(*src)); + rest -= src->length; + src = sg_next(src); + dst = sg_next(dst); + } + + /* create one bounce buffer */ + rounded = round_up(rest, CI_HDRC_PAGE_SIZE); + buf = kmalloc(rounded, GFP_KERNEL); + if (!buf) { + sg_free_table(&hwreq->sgt); + return -ENOMEM; + } + + sg_set_buf(dst, buf, rounded); + + hwreq->req.sg = hwreq->sgt.sgl; + hwreq->req.num_sgs = nents; + hwreq->sgt.sgl = sg; + hwreq->sgt.nents = num_sgs; + + if (copy) + sg_copy_to_buffer(src, num_sgs - index, buf, rest); + + *bounced = rest; + + return 0; +} + +static void sglist_do_debounce(struct ci_hw_req *hwreq, bool copy) +{ + void *buf; + int i, nents, num_sgs; + struct scatterlist *sg, *src, *dst; + + sg = hwreq->req.sg; + num_sgs = hwreq->req.num_sgs; + src = sg_last(sg, num_sgs); + buf = sg_virt(src); + + if (copy) { + dst = hwreq->sgt.sgl; + for (i = 0; i < num_sgs - 1; i++) + dst = sg_next(dst); + + nents = hwreq->sgt.nents - num_sgs + 1; + sg_copy_from_buffer(dst, nents, buf, sg_dma_len(src)); + } + + hwreq->req.sg = hwreq->sgt.sgl; + hwreq->req.num_sgs = hwreq->sgt.nents; + hwreq->sgt.sgl = sg; + hwreq->sgt.nents = num_sgs; + + kfree(buf); + sg_free_table(&hwreq->sgt); +} + /** * _hardware_enqueue: configures a request at hardware level * @hwep: endpoint @@ -552,6 +673,8 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) struct ci_hdrc *ci = hwep->ci; int ret = 0; struct td_node *firstnode, *lastnode; + unsigned int bounced_size; + struct scatterlist *sg; /* don't queue twice */ if (hwreq->req.status == -EALREADY) @@ -559,11 +682,28 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) hwreq->req.status = -EALREADY; + if (hwreq->req.num_sgs && hwreq->req.length) { + ret = sglist_get_invalid_entry(ci->dev->parent, hwep->dir, + &hwreq->req); + if (ret < hwreq->req.num_sgs) { + ret = sglist_do_bounce(hwreq, ret, hwep->dir == TX, + &bounced_size); + if (ret) + return ret; + } + } + ret = usb_gadget_map_request_by_dev(ci->dev->parent, &hwreq->req, hwep->dir); if (ret) return ret; + if (hwreq->sgt.sgl) { + /* We've mapped a bigger buffer, now recover the actual size */ + sg = sg_last(hwreq->req.sg, hwreq->req.num_sgs); + sg_dma_len(sg) = min(sg_dma_len(sg), bounced_size); + } + if (hwreq->req.num_mapped_sgs) ret = prepare_td_for_sg(hwep, hwreq); else @@ -742,6 +882,10 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) usb_gadget_unmap_request_by_dev(hwep->ci->dev->parent, &hwreq->req, hwep->dir); + /* sglist bounced */ + if (hwreq->sgt.sgl) + sglist_do_debounce(hwreq, hwep->dir == RX); + hwreq->req.actual += actual; if (hwreq->req.status) @@ -1588,6 +1732,9 @@ static int ep_dequeue(struct usb_ep *ep, struct usb_request *req) usb_gadget_unmap_request(&hwep->ci->gadget, req, hwep->dir); + if (hwreq->sgt.sgl) + sglist_do_debounce(hwreq, false); + req->status = -ECONNRESET; if (hwreq->req.complete != NULL) { diff --git a/drivers/usb/chipidea/udc.h b/drivers/usb/chipidea/udc.h index 5193df1e18c7..c8a47389a46b 100644 --- a/drivers/usb/chipidea/udc.h +++ b/drivers/usb/chipidea/udc.h @@ -69,11 +69,13 @@ struct td_node { * @req: request structure for gadget drivers * @queue: link to QH list * @tds: link to TD list + * @sgt: hold original sglist when bounce sglist */ struct ci_hw_req { struct usb_request req; struct list_head queue; struct list_head tds; + struct sg_table sgt; }; #ifdef CONFIG_USB_CHIPIDEA_UDC