From patchwork Sat Jun 21 19:07:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Johannes Schneider X-Patchwork-Id: 899181 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011051.outbound.protection.outlook.com [52.101.65.51]) (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 CA66F26A0F3; Sat, 21 Jun 2025 19:07:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750532851; cv=fail; b=Qd/H/pV4lMrMTwDP/TsrhrvTTmCGZz1D3sYKJzjx59zGsAELbD0e/zjPFXMOEJMxFpURquTBwJA2IUG3lMgv2T/Fu/3hK/0rM4wtL7hYAwsxOHr6+zKeWVp/JNTQeR69P+xYFMjQZP9JqweE53nMvIDBa+mkRWXTidlc/rzvCVE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750532851; c=relaxed/simple; bh=/BU3hgn5yD1T/4P6vtGOx7X6s0wuPbUXKqHBNF2pSaQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LSu8Uu236Jfjf3xfCJvme08jOWVAlt3MTTZZh1KUv4J85iaOHtNZX4HCLq+qCEeBhEb1dWDzCj5QTVpQAXkxvVXMtbWpsXolT8zTHf9w/bUlWQTMd3Z7Pyo41/ay4LmFWWmaG8taF/BChIPi32YHVVNIojy8FNDtAZT3+c918jE= 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=kcU66npb; arc=fail smtp.client-ip=52.101.65.51 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="kcU66npb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=v6eg8YH/V6TtkfTuJW0NKneua38V2xfu2owtJRLrOsiY4uZj8WODMWZ5joxWiABM4wrIVqYloJfExrWMMjeQU77TvsewqqRWgFc8ifZbdI7NvzQ7fjdXmtTMB4wYR598zNP8UUyiesSl4HcRTCamGCCBxpfWS5yeMQYG8T/R3HIxA7JOirKWERnf4IVAGRIYK7gJ7h8L5ycY8Tmt8+UCSv3GxyYapyTLzxLMFU3MWjxraf5KpRsbDoU/hlsMDeM73zSEEnDfkhEVFpEEnRF46lSvx+ZvZ7qY2C3gj/r5hgMO0LOxegc4Y4uZYfXWfPzl6v6v4gV0vyaPfbTibh00CA== 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=dbnmzeNVrOqJ7l8cdc0wCZw3ORYcI5MQc6Nwc4wkfww=; b=HghtMI20mZjtBYnYwg6Jl6oR5g3sUzONJBR1eVmpXHpN2OD8XvHvT3ZrSbiTp/emWhZ7DDRr3Sb7mZJJecLk5h/7C9Pu9bTHNMZYkb+dCvbOeXrcja6MnHsWZARIGq10XSt54uY/aDAsQDqXPH2KFMpcg8EpjrJ4rYovbiiUaqF1Doh1Dl1ctXI4B+aGgwA0xIWejmKyu2LjqOx67pXtbMgx9HDeps5Jja+ZrVxNvvic0y/kVT7JGDQ/NzLBIlnJeCVa9mf9SceRX9wev1NNRc2YX4qfL3nkCZZF15N4LBxpr+F3UBJ44rtX6wOefV844EFZhB8ufrj0T/+k1r1pHg== 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=dbnmzeNVrOqJ7l8cdc0wCZw3ORYcI5MQc6Nwc4wkfww=; b=kcU66npbXYkMPQHuZ8/c7mvBNxz22H2WT1eUWHRIxosdNkUo0Bltx8zb5f4Vp940kLUKre4GJOnRvlOpT9FspL4Xj2+b6l91hTnuHhfvmKNCIPKoLJHAxPdohkdq2ecE2MWLOgbzUfdAr0WxEaHhd1/024GJAfyDcIBARYHmE7c= Received: from AS9PR04CA0114.eurprd04.prod.outlook.com (2603:10a6:20b:531::19) by AM7PR06MB6818.eurprd06.prod.outlook.com (2603:10a6:20b:1ab::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.27; Sat, 21 Jun 2025 19:07:26 +0000 Received: from AMS0EPF000001B2.eurprd05.prod.outlook.com (2603:10a6:20b:531:cafe::96) by AS9PR04CA0114.outlook.office365.com (2603:10a6:20b:531::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8857.27 via Frontend Transport; Sat, 21 Jun 2025 19:07:26 +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 AMS0EPF000001B2.mail.protection.outlook.com (10.167.16.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.21 via Frontend Transport; Sat, 21 Jun 2025 19:07:25 +0000 Received: from aherlnxbspsrv01.lgs-net.com ([10.60.34.116]) by hexagon.com with Microsoft SMTPSVC(10.0.17763.1697); Sat, 21 Jun 2025 21:07:21 +0200 From: Johannes Schneider Date: Sat, 21 Jun 2025 21:07:15 +0200 Subject: [PATCH 2/3] 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: <20250621-dwc3-fix-gadget-mtp-v1-2-a45e6def71bb@leica-geosystems.com> References: <20250621-dwc3-fix-gadget-mtp-v1-0-a45e6def71bb@leica-geosystems.com> In-Reply-To: <20250621-dwc3-fix-gadget-mtp-v1-0-a45e6def71bb@leica-geosystems.com> To: Thinh Nguyen , Greg Kroah-Hartman Cc: Pengutronix Kernel Team , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, bsp-development.geo@leica-geosystems.com, Johannes Schneider X-Mailer: b4 0.14.2 X-OriginalArrivalTime: 21 Jun 2025 19:07:21.0578 (UTC) FILETIME=[B724ACA0:01DBE2DF] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AMS0EPF000001B2:EE_|AM7PR06MB6818:EE_ X-MS-Office365-Filtering-Correlation-Id: f9a1703a-bc5a-450b-6a21-08ddb0f6dc3d 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|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?aLp/B16Df/DSRkOjDbna9SiovPVFR2R?= =?utf-8?q?VTk65EHahCYUYnxGKV2S22fAQBGiZ9CTKMsjSbQhhvPJ0ve8HNSZiaQM5vD5hnKLJ?= =?utf-8?q?L5h3Qa4rNIXLYRbu2ROCM0KApjiA9gtKw+LJbLQZ5eSB6trXJhgICUXi8nFiZt8LT?= =?utf-8?q?KzEI18alsFWsbMpvWSsgxQ9+e+1kgDMoesI8yuep6SQhWj1AUjbfm4L2TT9rQwAoU?= =?utf-8?q?aaxFQQNMyBUlkfeNn+IXs0Y5yatk+QkrUQgY3PErqvNpsEI7GW/fONLkvX3z7yYvI?= =?utf-8?q?twYC8DeIbWbL+wwoGQ5FS4daKbda6AJi1dIOqWgrHA8Z7my2GhOtHNlcnGoPJRR4J?= =?utf-8?q?pq9M4lrrse2RmDlIE49lKo0TPcUXZz8bMVuf7JC2QGre1xtcwifH28WREazX81Z2k?= =?utf-8?q?HCzO++vunTM92fpJ9YQ/8AAxjt/V+/yWjZx2F7G0Q5jyM1CxdTIhEpL+cpgKwhNRV?= =?utf-8?q?USO3x5oqzRRmDLy0BprFzFLGvq2kUCCaw3/M1rSnS/qLj3X22fe9u4EaNDw7Ze2Ac?= =?utf-8?q?TEY2r25oaum6SR0FZFXPIRTXAsiIJ4PEDUtl17oHZdnIz8Tv0FsOG/dLsHT1FXJNp?= =?utf-8?q?0KP+W0RKii5prT9AG+Z5LkcbZBY/rn9pkA83Wjp8xYO/Gk99DUHP2+icdbzfEB5Fb?= =?utf-8?q?TTEIqQLGd8xj73rGGe0zx3zIbN6UmYvZvNj/odeMZfZOTXNCOEmAr6cuWOD0Snsf6?= =?utf-8?q?MzMS4x5wtjqyIPjedOvGa5bAdpKIDTgju6ItgZTtqS6E8fJYXh2bZ5Y0hU5yTnodn?= =?utf-8?q?FViZuJ+UDdpQ++cuZQJkZcLBMzh8J5ofaM8shhiW9ZcOB3OS92hEcWOpXJSuXe279?= =?utf-8?q?9GyILuKJb6GeNk6D10/seWlv2Z395JbmxRP29G/EB9UU9bFNZloQx5P8nDn4GvC8u?= =?utf-8?q?Tu7OcnCzNNZVQAc2jI5Nr0jZe1cKtNbzsP1EYRRPwjKUVYNcMZU/THdZblOciT2km?= =?utf-8?q?5kugdnUJOURkLcDWPvy18fMgRVvfuOMKvu4YdqLH+NwrHPzaD3Ygd4FaqzxOQQH/Q?= =?utf-8?q?S9MWsEcMaD+hbiniAFNvyP0hhZOKZ7+Zm7Ndmd+K6DpMwq002CwhVX99oU65k4Pq0?= =?utf-8?q?f73ggX8WQQc1i5EzJdSuqoQz2gf75SwJABOEJbEVikjoLfpuGS2T6r/qzHyAPZqq9?= =?utf-8?q?geBVDBUlW4Qx5TOxb5qELvMyH+nX9PLDo72NkOetOYi31YJ5s85dsotMroLq0bSji?= =?utf-8?q?nUKOu676gNc//GQPzDcn3SOsCqTZHv3uDQCL05+PkfdtPF+Z2TbCB5oKZyFnrdDl9?= =?utf-8?q?uvQgaoEBDP28QJj6+jefFP2Kmaj5YoYzkVf0s1xroFKEcFj2eMc+29x3dn3TVLLUg?= =?utf-8?q?Owu+t/ZQzZ0So5In3fztHn7nLF/cVVn9LW6YTj4zujcqPAZAZqoMUVOc0da6yxXRw?= =?utf-8?q?JDP9aP9Wf2gwBFQtuYNtHOQHFwdDNmTSfa2TqEQDU46CNjOA9EFUFt24J2FlldPxz?= =?utf-8?q?yzV5KnprMu?= 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)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2025 19:07:25.9008 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9a1703a-bc5a-450b-6a21-08ddb0f6dc3d 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: AMS0EPF000001B2.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR06MB6818 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. Signed-off-by: Johannes Schneider Acked-by: Thinh Nguyen --- 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; }