From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D21583806DD; Sat, 12 Sep 2026 09:58:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789207082; cv=none; b=Rxr/ETD2k9IXOn/KIR6+T7/fraYbmkt1sGITfmZyFp0AtU3HlKLYwESvHNvQIycJXYFgZyTaJ64Eaexpdj2C5GDPt66iYiaXpYLIqTPchr96NuEAvmIKE4xTD4du7GDGmuq97gx2g1hSczstWkNOk5L4SPtb1peKojJ0QG5D3hk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789207082; c=relaxed/simple; bh=0RtOwW7ZsOUbDGKk9yypZ9RwvuA2N/DsZ0YLTKqJDSY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UP0odF+H6d18FnBvZX2NenHDA9KHGz7P8PsuhdJOHfZsk5GOLzULFiOVlxM6t5bYVl4DY/66x6D1ouX2wsNFNK4Y2ZOJMoGoIRb8AlWvv2lMOfPm9RJPWNTNLuowmXwF2azI618pdIANsXluWV/ATCLGV2+vwzZOAfxzGh2XwQE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TlMJigOG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TlMJigOG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C3C91F000FF; Sat, 12 Sep 2026 09:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789207081; bh=BcfEEnpmXEMaYQg/NiVApnzhuHedqR3eIfwZBHNdXfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TlMJigOGuw9Wci6BF5pTiu2tcahB3f2VYbsHtfW+chI9C6vITOJiNZApHeodVYlGh PY1G8pWjmj/zP5Cbtr6cZh8ZMRuIUEVVcFYELpwTvenxENboAb6N7G9vtzu/PvJqiv EMoAYzHiL4Nz9O+6O+mQMNFgV1uQHSRu0CecrZKs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fei Shao , Sasha Levin Subject: [PATCH 6.18 0322/1518] usb: mtu3: allow system suspend during active gadget connection Date: Sat, 12 Sep 2026 08:41:31 +0200 Message-ID: <20260912065630.761193432@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fei Shao [ Upstream commit e69027c25361b6044c7928715667586cc5469063 ] When operating in gadget mode connected to a USB host, system suspend fails with -EBUSY because active peripheral connections block suspend entry. Fix this by restricting the -EBUSY check to runtime autosuspend (PMSG_IS_AUTO). For system suspend (!PMSG_IS_AUTO), perform soft disconnect to disconnect from the bus and allow MAC sleep. Fixes: 427c66422e14 ("usb: mtu3: support suspend/resume for device mode") Signed-off-by: Fei Shao Link: https://patch.msgid.link/20260626082218.2750459-2-fshao@chromium.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/mtu3/mtu3_core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c index a3a6282893d09..ca8cb6c3a01bf 100644 --- a/drivers/usb/mtu3/mtu3_core.c +++ b/drivers/usb/mtu3/mtu3_core.c @@ -1037,9 +1037,14 @@ int ssusb_gadget_suspend(struct ssusb_mtk *ssusb, pm_message_t msg) if (!mtu->gadget_driver) return 0; - if (mtu->connected) + /* Prevent runtime suspend when active connection exists */ + if (mtu->connected && PMSG_IS_AUTO(msg)) return -EBUSY; + /* Perform soft disconnect for system suspend */ + if (mtu->softconnect && !PMSG_IS_AUTO(msg)) + mtu3_dev_on_off(mtu, 0); + mtu3_dev_suspend(mtu); synchronize_irq(mtu->irq); @@ -1055,5 +1060,9 @@ int ssusb_gadget_resume(struct ssusb_mtk *ssusb, pm_message_t msg) mtu3_dev_resume(mtu); + /* Restore soft connect for system resume */ + if (mtu->softconnect && !PMSG_IS_AUTO(msg)) + mtu3_dev_on_off(mtu, 1); + return 0; } -- 2.53.0