From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 40A4718E025; Tue, 17 Jun 2025 16:24:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750177464; cv=none; b=i4msSGmfLVpVvEsxypUHhBj9dzbp4UUrarIuNC6Y7izg8QdVxns6o2+egBNfGkHwQF/avaPt+45qzioL+C3l0w5+rI5zxgsgkIm1q4j2h9j6IRW4PZz67P1BgV2GV0+0wrK1Qb/3jgDABq0WURJs9sP7cay3zNJPhP04jJlP23I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750177464; c=relaxed/simple; bh=bIgV9gya83qNuNfgRrXNDbXqn5fYdpi9crglEOCY9oE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sTNDIMiatnhjC8a/JlHf3kQhykhWPiw+tJxPb6mFxwVrA5gpVSX+uiU8gZu8ZcfZUKwK3ZZ+SzJ2QMis+CcpQ+GdrRqk1cThijLSklW5TVOJ3WLsQ9xkeYqWOoaqyjDEMUbileudjCNj/7adxDtM+cAx7E7MUsyE4pHd1oH2Iww= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=msmyKxWX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="msmyKxWX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4BBFC4CEE3; Tue, 17 Jun 2025 16:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750177464; bh=bIgV9gya83qNuNfgRrXNDbXqn5fYdpi9crglEOCY9oE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=msmyKxWX1OLdUb3HI1bqrB+DSi0k6PWF5jFuL2ttTOh9ilze/Eze0MLfpuymhjixe /cpXTiZvNTc/Me0IYLmXCGyXsPwVFhYr1sQBxcrbe/FlPBXGPgBZffDexazBpAkjdn Jlzbv7ufb4A/qkBTGILI/TbvF7JDDKJId3/YahQo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yanqing Wang , Macpaul Lin , Biao Huang , Paolo Abeni , Sasha Levin Subject: [PATCH 6.12 350/512] driver: net: ethernet: mtk_star_emac: fix suspend/resume issue Date: Tue, 17 Jun 2025 17:25:16 +0200 Message-ID: <20250617152433.765559130@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152419.512865572@linuxfoundation.org> References: <20250617152419.512865572@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yanqing Wang [ Upstream commit ba99c627aac85bc746fb4a6e2d79edb3ad100326 ] Identify the cause of the suspend/resume hang: netif_carrier_off() is called during link state changes and becomes stuck while executing linkwatch_work(). To resolve this issue, call netif_device_detach() during the Ethernet suspend process to temporarily detach the network device from the kernel and prevent the suspend/resume hang. Fixes: 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver") Signed-off-by: Yanqing Wang Signed-off-by: Macpaul Lin Signed-off-by: Biao Huang Link: https://patch.msgid.link/20250528075351.593068-1-macpaul.lin@mediatek.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/mediatek/mtk_star_emac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c index c2ab87828d858..5eb7a97e7eb17 100644 --- a/drivers/net/ethernet/mediatek/mtk_star_emac.c +++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c @@ -1468,6 +1468,8 @@ static __maybe_unused int mtk_star_suspend(struct device *dev) if (netif_running(ndev)) mtk_star_disable(ndev); + netif_device_detach(ndev); + clk_bulk_disable_unprepare(MTK_STAR_NCLKS, priv->clks); return 0; @@ -1492,6 +1494,8 @@ static __maybe_unused int mtk_star_resume(struct device *dev) clk_bulk_disable_unprepare(MTK_STAR_NCLKS, priv->clks); } + netif_device_attach(ndev); + return ret; } -- 2.39.5