From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH RFC 13/18] r8168: replace speed_down with genphy_restart_aneg Date: Thu, 21 Dec 2017 21:50:39 +0100 Message-ID: <704cc35b-d54a-4220-2a24-dec9521e05af@gmail.com> References: <83321b2e-8402-26c5-9703-3fe795cc893d@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: David Miller , "netdev@vger.kernel.org" To: Andrew Lunn , Realtek linux nic maintainers , Chun-Hao Lin Return-path: Received: from mail-wm0-f66.google.com ([74.125.82.66]:37677 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755618AbdLUUvV (ORCPT ); Thu, 21 Dec 2017 15:51:21 -0500 Received: by mail-wm0-f66.google.com with SMTP id f140so18168038wmd.2 for ; Thu, 21 Dec 2017 12:51:20 -0800 (PST) In-Reply-To: <83321b2e-8402-26c5-9703-3fe795cc893d@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Dealing with link partner abilities is handled by phylib, so let's just trigger autonegotiation here. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8168.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8168.c b/drivers/net/ethernet/realtek/r8168.c index d33f93a31..6b398915f 100644 --- a/drivers/net/ethernet/realtek/r8168.c +++ b/drivers/net/ethernet/realtek/r8168.c @@ -4360,30 +4360,6 @@ static void rtl_init_mdio_ops(struct rtl8168_private *tp) } } -static void rtl_speed_down(struct rtl8168_private *tp) -{ - u32 adv; - int lpa; - - rtl_writephy(tp, 0x1f, 0x0000); - lpa = rtl_readphy(tp, MII_LPA); - - if (lpa & (LPA_10HALF | LPA_10FULL)) - adv = ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full; - else if (lpa & (LPA_100HALF | LPA_100FULL)) - adv = ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | - ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full; - else - adv = ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | - ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | - (tp->mii.supports_gmii ? - ADVERTISED_1000baseT_Half | - ADVERTISED_1000baseT_Full : 0); - - rtl8168_set_speed(tp->dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL, - adv); -} - static void rtl_wol_suspend_quirk(struct rtl8168_private *tp) { void __iomem *ioaddr = tp->mmio_addr; @@ -4424,7 +4400,7 @@ static bool rtl_wol_pll_power_down(struct rtl8168_private *tp) if (!(__rtl8168_get_wol(tp) & WAKE_ANY)) return false; - rtl_speed_down(tp); + genphy_restart_aneg(tp->dev->phydev); rtl_wol_suspend_quirk(tp); return true; -- 2.15.1