From patchwork Tue Jun 24 10:53:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Johannes Schneider X-Patchwork-Id: 899697 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011058.outbound.protection.outlook.com [40.107.130.58]) (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 EE047286D5C; Tue, 24 Jun 2025 10:53:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750762426; cv=fail; b=BD7fJ/e3iwPt+mXDQf1XvvgZMv+2ymLTtIx0j/KffgHe4PtvjTIUNKYmF5D/3+kzkbXfHgjRpPafM/9VIzIH4ItxvL5ijZiwiwgLmh3y9seIyffekYmdqBjNI6LDJQ6rn9y0wHuHqABwo9wJIlOhV9HcNEWrFtaEwqCriyZXQmA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750762426; c=relaxed/simple; bh=ySmdgbjjWwzam3PMv1W5Jw7m0nltGPcZ1Z8QHn/jQ3Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PnW8F/cO4QCS30csaI/1O92+Tl+Y/IbQFf1cW4UcfIMcKd/Ti4J8wNwxK3Mj2NSbWueDZZP+VdtR0IS1hck2/5KGRxUfDsG1pOaDfgxVrcbuhrKFz3fryl78ZLCWJ3iWJpqHGtdsPPg2sAP6+Gx3W/4ltkNeVJ1BLEA12WD/xws= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=leica-geosystems.com; spf=fail smtp.mailfrom=leica-geosystems.com; dkim=pass (1024-bit key) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.b=cMzRwScY; arc=fail smtp.client-ip=40.107.130.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=leica-geosystems.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=leica-geosystems.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.b="cMzRwScY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IZ3yOp1mDLVty04HtQF335P8BILCeALs0Wp3fAarQ1iZLOvP48ExjrHadZkGlbGybUgUp2EfOaFg8u9ftQih7h+9EVlOh3ImuvdXTyMa57nK9FUnG6UZF3v2Pp2WTrW6uRwmSdaiR4OY22JEFfGOwL1TAtqSAB2F2t22OIgKcxgJeOuPWs5jdqsWYTFvw2r8Q6SNn4Kr6a2pDU5qaXGvkTG/fhRhXgHYJrWPqa9jvebNRJ7IVcRU+Y4cFRIRbeJ/9jKY5JEhW71nUdVj5gxLwpQY1bIftVANFexDNFceM9eOOhvN2f35VLz2Br0idRkUvvneQJ6hAdjhey1BLrGG6A== 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=93AtsQcPW0Y617Zyhl2dB8W5wyfiml0H6iqU6IKuvLY=; b=B9w4FsZxFyF+/+QkfCCRApv4JRaQIUcJOz5tIac7nvZLQ7gU3vrGLqoPhCKrPnbthnyQ0Yza7Us7CxIU4VLXC+ea45uj5pb0VpeMbz+nK++3UTCr5H7w0QHJsB6QVlbUowsHz32vQjnAOE0fQN5gYR8zGneabBoBfqe25WAmBDSM8OLyHj/IUW3dD2U2NUMQRz9UsOt63NAKMwTSLgxCm3To3f3rTZjCpEEWG5RxX1LNs0G3p7SyWkNpTc9tae8C++WWGb11cS6S07pTrxMJiqR3GiB2RDqIJ2ENX3RVmki9yH1XYhezvqFOU/rt0ylUrgJxNgXYpQXD/ABzYOaIsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 193.8.40.94) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=leica-geosystems.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=leica-geosystems.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=93AtsQcPW0Y617Zyhl2dB8W5wyfiml0H6iqU6IKuvLY=; b=cMzRwScYuq5T2C2DR62Q356fneZTzUOxVWVV5Is8e3b/tVm5OM6Bqw/SyirTEyETn9Kbuq5ycID/HM5cSnImS7Yj+2uAR47/GDgzOwFmeEbs985DF5/MfiJvwDPzxj3ETFpygL41xZPkN6Lw9Mub6SMBzFiqgZ7vFYG//lHijk8= Received: from AM0PR10CA0023.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::33) by AM7PR06MB6705.eurprd06.prod.outlook.com (2603:10a6:20b:1a4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.28; Tue, 24 Jun 2025 10:53:41 +0000 Received: from AMS0EPF000001A7.eurprd05.prod.outlook.com (2603:10a6:208:17c:cafe::c0) by AM0PR10CA0023.outlook.office365.com (2603:10a6:208:17c::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8857.30 via Frontend Transport; Tue, 24 Jun 2025 10:53:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 193.8.40.94) smtp.mailfrom=leica-geosystems.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=leica-geosystems.com; Received-SPF: Pass (protection.outlook.com: domain of leica-geosystems.com designates 193.8.40.94 as permitted sender) receiver=protection.outlook.com; client-ip=193.8.40.94; helo=hexagon.com; pr=C Received: from hexagon.com (193.8.40.94) by AMS0EPF000001A7.mail.protection.outlook.com (10.167.16.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Tue, 24 Jun 2025 10:53:41 +0000 Received: from aherlnxbspsrv01.lgs-net.com ([10.60.34.116]) by hexagon.com with Microsoft SMTPSVC(10.0.17763.1697); Tue, 24 Jun 2025 12:53:40 +0200 From: Johannes Schneider Date: Tue, 24 Jun 2025 12:53:13 +0200 Subject: [PATCH v2 2/2] usb: dwc3: gadget: Simplify TRB reclaim logic by removing redundant 'chain' argument Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250624-dwc3-fix-gadget-mtp-v2-2-0e2d9979328f@leica-geosystems.com> References: <20250624-dwc3-fix-gadget-mtp-v2-0-0e2d9979328f@leica-geosystems.com> In-Reply-To: <20250624-dwc3-fix-gadget-mtp-v2-0-0e2d9979328f@leica-geosystems.com> To: Thinh Nguyen , Greg Kroah-Hartman Cc: Pengutronix Kernel Team , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, bsp-development.geo@leica-geosystems.com, Johannes Schneider X-Mailer: b4 0.14.2 X-OriginalArrivalTime: 24 Jun 2025 10:53:40.0119 (UTC) FILETIME=[3E9DFA70:01DBE4F6] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001A7:EE_|AM7PR06MB6705:EE_ X-MS-Office365-Filtering-Correlation-Id: 76775d22-3dc2-42fc-0a40-08ddb30d61e8 X-SET-LOWER-SCL-SCANNER: YES X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?OF3YQVGOQHGtefyE8DsVV1HSQB/5L4b?= =?utf-8?q?EbGxB5coa2aem9tJfXl+ncwNVT7rOVvUwKYPMtH7JF4jXRdrMjK9Oc5vk6eZ2+R2r?= =?utf-8?q?CEfvCwXYr7b08lNvcE14gTQIWOsc/OZJIeIZU1q9gGuLNlPFg6exvBloNa88O7P9Q?= =?utf-8?q?uJ1nhcvbCbvkgpt5s5qox9op6E13zOJ6a1vJl1rL2aAwNTrfjmJ+mOYBNOPDgNC8U?= =?utf-8?q?lmaurk+EI/9b+RiKfICzBFY9vRLH6oUpQVFLV1bgq5sNl7MpYxKsQFRLdreSuHCRO?= =?utf-8?q?sn3Ai2mKJ1IjxM7HI5CgZHAvt/mriRw9jMTBSehYnBcLAgrUTfNN2gv8m4PxHuxF9?= =?utf-8?q?TFr6JJnQJoxPdY9FnUhJV3gNw7yesHUA2sPG257k0wRCowfsSIbhTzWJXrusBFuAJ?= =?utf-8?q?Zf7KvadoimB8a3TZwBg8ELLCAHm8EGiEtMT1+VDsTII7tkb2fP0sLCCo3aabn5Lv9?= =?utf-8?q?k9iLbnNDjhg/zjx0YIAF884FLMhqS6C9sEBZYmubWw2riqk15y22PpTjiQBDS897G?= =?utf-8?q?bYKmyuOU/7WlA4jm2dHWbkB7AxVjNEO5HRGL9XGJ2p5md7oDIhbPSR5iLgVMra1Pe?= =?utf-8?q?AnZ/W0mdrL9mmtvs9Gmy0Ewqq29lQa/h3VuzawHUtphW4oLr1CRObuGU8M7ogYFXW?= =?utf-8?q?ywPWkzAFOUlsk+8SE5nHiRfxihF0Lf2VJybpebkCWvj2msICRvHovy4zm95h7NkeL?= =?utf-8?q?0ql5wPqkBOvnpElvtdOw6aIlMFE6aa/on6XzJSiFx5nsARRfuyNNwXcsuY1vl4b51?= =?utf-8?q?5v4Mv0jVgUGwA3cvcDKUByo16tj5i6h2EgJGlmQ1DJlqgj2XnxDZILJurwSWUZO5r?= =?utf-8?q?iPK2uAiaubQZ0EnPlKmLwue+gkRIGkdOLdhm8FKXCjgriLNmTP5RJ/V4aM9PF4/uR?= =?utf-8?q?pqHmqrsRCtNfCO/gUMukJgrzoXpZwtA2ui9kjCN06AU82ON1CEy3fCahVujBXIlzA?= =?utf-8?q?US52AIbamLStHjJHejtXpH0EB9Y3hac1cFobooidWOzCBDngqO+fc/E7xVKdcq6Fh?= =?utf-8?q?qQZzhmFSSbXwKINlJBIqixAuIsBgqBNTTMJPLIeJ3PsZCxKNjzHlSXSW+DkPBFcRr?= =?utf-8?q?2fIi+lQyh4DSkjIcou5QzpdxTzN3ZNFY96TkomLWOCtlBoHj8GN7kxoLNK1Vr5TCp?= =?utf-8?q?/1nso5GLaMLiKdhzftIouP3b8iVW8WaeZ5bnKy+EcOD8V26XgeCkiHpqxEoER2oGN?= =?utf-8?q?B+9imoE2ye08lwxIH3e4kj6fLGz9fbdo604kiPZ4RnZ/KTfcwW+7/G+Gb7oeXzHax?= =?utf-8?q?9B2/MjCbsG5qpmgYAQHRUj33++e//4UMXWiwpxsDF3g2CjFSIOnI2utEedemtCWIY?= =?utf-8?q?KQtxcOb9nYsyqRataLc8owAvGK72HgEZdZoaqQ8r2IlbJFRP+Nq8u030GtFwb5HRc?= =?utf-8?q?PaHb1XzwDqXBZ2UGW+AB+KWpLgsLXQCVjHZ5vm6GTZbNaqvZMbltpcgFuHKCITHIE?= =?utf-8?q?oNDMDcydAn?= X-Forefront-Antispam-Report: CIP:193.8.40.94; CTRY:CH; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:hexagon.com; PTR:ahersrvdom50.leica-geosystems.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:53:41.4017 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76775d22-3dc2-42fc-0a40-08ddb30d61e8 X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a; Ip=[193.8.40.94]; Helo=[hexagon.com] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001A7.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR06MB6705 Now that the TRB reclaim logic always inspects the TRB's CHN (Chain) bit directly to determine whether a TRB is part of a chain, the explicit 'chain' parameter passed into dwc3_gadget_ep_reclaim_completed_trb() is no longer necessary. This cleanup simplifies the reclaim code by avoiding duplication of chain state tracking, and makes the reclaim logic rely entirely on the hardware descriptor flags — which are already present and accurate at this stage. No functional changes intended. Acked-by: Thinh Nguyen Signed-off-by: Johannes Schneider --- drivers/usb/dwc3/gadget.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 99fbd29d8f46d30df558ceb23d2afe7187b4244c..a4a2bf273f943fa112f49979297023a732e0af2e 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -3497,7 +3497,7 @@ static void dwc3_gadget_free_endpoints(struct dwc3 *dwc) static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep, struct dwc3_request *req, struct dwc3_trb *trb, - const struct dwc3_event_depevt *event, int status, int chain) + const struct dwc3_event_depevt *event, int status) { unsigned int count; @@ -3549,7 +3549,8 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep, if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN) return 1; - if (event->status & DEPEVT_STATUS_SHORT && !chain) + if (event->status & DEPEVT_STATUS_SHORT && + !(trb->ctrl & DWC3_TRB_CTRL_CHN)) return 1; if ((trb->ctrl & DWC3_TRB_CTRL_ISP_IMI) && @@ -3576,8 +3577,7 @@ static int dwc3_gadget_ep_reclaim_trb_sg(struct dwc3_ep *dep, trb = &dep->trb_pool[dep->trb_dequeue]; ret = dwc3_gadget_ep_reclaim_completed_trb(dep, req, - trb, event, status, - !!(trb->ctrl & DWC3_TRB_CTRL_CHN)); + trb, event, status); if (ret) break; }