From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net] r8169: fix autoneg issue on resume with RTL8168E Date: Thu, 20 Sep 2018 22:47:09 +0200 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" , Neil MacLeod To: David Miller , Realtek linux nic maintainers Return-path: Received: from mail-wm1-f67.google.com ([209.85.128.67]:33204 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726128AbeIUCch (ORCPT ); Thu, 20 Sep 2018 22:32:37 -0400 Received: by mail-wm1-f67.google.com with SMTP id r1-v6so2498465wmh.0 for ; Thu, 20 Sep 2018 13:47:18 -0700 (PDT) Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: It was reported that chip version 33 (RTL8168E) ends up with 10MBit/Half on a 1GBit link after resuming from S3 (with different link partners). For whatever reason the PHY on this chip doesn't properly start a renegotiation when soft-reset. Explicitly requesting a renegotiation fixes this. Signed-off-by: Heiner Kallweit Fixes: a2965f12fde6 ("r8169: remove rtl8169_set_speed_xmii") Reported-by: Neil MacLeod Tested-by: Neil MacLeod --- drivers/net/ethernet/realtek/r8169.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 1d8631303..7f4647c58 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4069,6 +4069,15 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) phy_speed_up(dev->phydev); genphy_soft_reset(dev->phydev); + + /* It was reported that chip version 33 ends up with 10MBit/Half on a + * 1GBit link after resuming from S3. For whatever reason the PHY on + * this chip doesn't properly start a renegotiation when soft-reset. + * Explicitly requesting a renegotiation fixes this. + */ + if (tp->mac_version == RTL_GIGA_MAC_VER_33 && + dev->phydev->autoneg == AUTONEG_ENABLE) + phy_restart_aneg(dev->phydev); } static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) -- 2.19.0