r8169: improve runtime pm in rtl8169_check_link_status

This patch partially reverts commit 74fe67fdfdd3 "r8169: Fix runtime
power management" from 2010. At that time the suspend delay was 100ms
and therefore suspending happened during initial aneg. Currently
suspend delay is 5s, so suspend starts after aneg and the issue
doesn't exist any longer. On my system aneg takes almost 3s, to be on
the safe side let's increase the suspend delay to 10s.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 606fb76982fe235925f3c28ad03a53dbcef9bd25..29edaa4c6afa5889dee5a59bc4d672af3c454530 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1675,33 +1675,24 @@ static void rtl_link_chg_patch(struct rtl8169_private *tp)
        }
 }
 
-static void __rtl8169_check_link_status(struct net_device *dev,
-                                       struct rtl8169_private *tp,
-                                       void __iomem *ioaddr, bool pm)
+static void rtl8169_check_link_status(struct net_device *dev,
+                                     struct rtl8169_private *tp,
+                                     void __iomem *ioaddr)
 {
        if (tp->link_ok(ioaddr)) {
                rtl_link_chg_patch(tp);
                /* This is to cancel a scheduled suspend if there's one. */
-               if (pm)
-                       pm_request_resume(&tp->pci_dev->dev);
+               pm_request_resume(&tp->pci_dev->dev);
                netif_carrier_on(dev);
                if (net_ratelimit())
                        netif_info(tp, ifup, dev, "link up\n");
        } else {
                netif_carrier_off(dev);
                netif_info(tp, ifdown, dev, "link down\n");
-               if (pm)
-                       pm_schedule_suspend(&tp->pci_dev->dev, 5000);
+               pm_schedule_suspend(&tp->pci_dev->dev, 10000);
        }
 }
 
-static void rtl8169_check_link_status(struct net_device *dev,
-                                     struct rtl8169_private *tp,
-                                     void __iomem *ioaddr)
-{
-       __rtl8169_check_link_status(dev, tp, ioaddr, false);
-}
-
 #define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)
 
 static u32 __rtl8169_get_wol(struct rtl8169_private *tp)
@@ -7746,7 +7737,7 @@ static void rtl_slow_event_work(struct rtl8169_private *tp)
                rtl8169_pcierr_interrupt(dev);
 
        if (status & LinkChg)
-               __rtl8169_check_link_status(dev, tp, tp->mmio_addr, true);
+               rtl8169_check_link_status(dev, tp, tp->mmio_addr);
 
        rtl_irq_enable_all(tp);
 }