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 78D1D1D07BA; Wed, 2 Oct 2024 13:24:37 +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=1727875477; cv=none; b=hUZmi3Swh8Ts6DArFZ/z6+KGK8xgz3FGFXPdbwFqgJkoWUjpz3KVjH9eLFtjydTMQDcba0uJIXZT3Nb8T0+3gK39mVc3R06SOBY1E+OILmY2lbJ/avq1BA+OVznXpIoPw/i4a8PM4L5jfIA6TM21hF/tBjqyKC9qP4xWDebXJGk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727875477; c=relaxed/simple; bh=Naj36GcSqAasNGyDcXm1Z9Jp65Yb77aaCrMm+V1x5I8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xk/psut43HDBTOLjFFrJhFnSeYXnwZGTr+oQlIAG5qeFS/GqtsFV6fCSwIGT7SuRTQ3iMu3IaCG8QsV3TJwuPn+vYlzyKG54zOl4Z/ZE/VaaF3FYi40AMOy0yTl+ZCRF/mTQjk5xyh6hge+fo38X35/RYirVxVj0c0EAjO+AfSM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pepXxjTW; 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="pepXxjTW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB867C4CECD; Wed, 2 Oct 2024 13:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727875477; bh=Naj36GcSqAasNGyDcXm1Z9Jp65Yb77aaCrMm+V1x5I8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pepXxjTW2wDwM5Y5YqV2bCT7et/kkC6kAYSwU97WQlKP0hQpq+vs8Zh3MzB/psy+7 3Hnpv5/skyvVxrHwefxRMTFVex3KUMavQxrcwRvTm/oW1idoemH5B5xoySl9624tw9 ua+OCgS6zBgEv1r8dHU/IRsJ7XapID/D2e1/L/0A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, En-Wei WU , Heiner Kallweit , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.11 113/695] r8169: disable ALDPS per default for RTL8125 Date: Wed, 2 Oct 2024 14:51:51 +0200 Message-ID: <20241002125826.983925446@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 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.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heiner Kallweit [ Upstream commit b9c7ac4fe22c608acf6153a3329df2b6b6cd416c ] En-Wei reported that traffic breaks if cable is unplugged for more than 3s and then re-plugged. This was supposed to be fixed by 621735f59064 ("r8169: fix rare issue with broken rx after link-down on RTL8125"). But apparently this didn't fix the issue for everybody. The 3s threshold rang a bell, as this is the delay after which ALDPS kicks in. And indeed disabling ALDPS fixes the issue for this user. Maybe this fixes the issue in general. In a follow-up step we could remove the first fix attempt and see whether anybody complains. Fixes: f1bce4ad2f1c ("r8169: add support for RTL8125") Tested-by: En-Wei WU Signed-off-by: Heiner Kallweit Link: https://patch.msgid.link/778b9d86-05c4-4856-be59-cde4487b9e52@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/realtek/r8169_phy_config.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c index 1f74317beb887..e1e5d9672ae44 100644 --- a/drivers/net/ethernet/realtek/r8169_phy_config.c +++ b/drivers/net/ethernet/realtek/r8169_phy_config.c @@ -1060,6 +1060,7 @@ static void rtl8125a_2_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0xa86, 0x15, 0x0001, 0x0000); rtl8168g_enable_gphy_10m(phydev); + rtl8168g_disable_aldps(phydev); rtl8125a_config_eee_phy(phydev); } @@ -1099,6 +1100,7 @@ static void rtl8125b_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0xbf8, 0x12, 0xe000, 0xa000); rtl8125_legacy_force_mode(phydev); + rtl8168g_disable_aldps(phydev); rtl8125b_config_eee_phy(phydev); } -- 2.43.0