Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4fbce74 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by David S. Miller
Browse files

r8169: Fix runtime power management 



I noticed that one of the post-2.6.36 patches broke runtime PM of the
r8169 on my MSI Wind test machine in such a way that the link was not
brought up after reconnecting the network cable.

In the process of debugging the issue I realized that we only should
invoke the runtime PM functions in rtl8169_check_link_status() when
link change is reported and if we do so, the problem goes away.
Moreover, this allows rtl8169_runtime_idle() to be simplified quite
a bit.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6934d335

drivers/net/r8169.c

+16 −10
Original line number Original line Diff line number Diff line
@@ -744,26 +744,36 @@ static void rtl8169_xmii_reset_enable(void __iomem *ioaddr) 
	mdio_write(ioaddr, MII_BMCR, val & 0xffff);

	mdio_write(ioaddr, MII_BMCR, val & 0xffff);

}

}





static void rtl8169_check_link_status(struct net_device *dev,

static void __rtl8169_check_link_status(struct net_device *dev,

				      struct rtl8169_private *tp,

				      struct rtl8169_private *tp,

				      void __iomem *ioaddr)

				      void __iomem *ioaddr,

				      bool pm)

{

{

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&tp->lock, flags);

	spin_lock_irqsave(&tp->lock, flags);

	if (tp->link_ok(ioaddr)) {

	if (tp->link_ok(ioaddr)) {

		/* This is to cancel a scheduled suspend if there's one. */

		/* 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);

		netif_carrier_on(dev);

		netif_info(tp, ifup, dev, "link up\n");

		netif_info(tp, ifup, dev, "link up\n");

	} else {

	} else {

		netif_carrier_off(dev);

		netif_carrier_off(dev);

		netif_info(tp, ifdown, dev, "link down\n");

		netif_info(tp, ifdown, dev, "link down\n");

		if (pm)

			pm_schedule_suspend(&tp->pci_dev->dev, 100);

			pm_schedule_suspend(&tp->pci_dev->dev, 100);

	}

	}

	spin_unlock_irqrestore(&tp->lock, flags);

	spin_unlock_irqrestore(&tp->lock, flags);

}

}





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)

#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)





static u32 __rtl8169_get_wol(struct rtl8169_private *tp)

static u32 __rtl8169_get_wol(struct rtl8169_private *tp)
@@ -4600,7 +4610,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) 
		}

		}





		if (status & LinkChg)

		if (status & LinkChg)

			rtl8169_check_link_status(dev, tp, ioaddr);

			__rtl8169_check_link_status(dev, tp, ioaddr, true);





		/* We need to see the lastest version of tp->intr_mask to

		/* We need to see the lastest version of tp->intr_mask to

		 * avoid ignoring an MSI interrupt and having to wait for

		 * avoid ignoring an MSI interrupt and having to wait for
@@ -4890,11 +4900,7 @@ static int rtl8169_runtime_idle(struct device *device) 
	struct net_device *dev = pci_get_drvdata(pdev);

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);

	struct rtl8169_private *tp = netdev_priv(dev);





	if (!tp->TxDescArray)

	return tp->TxDescArray ? -EBUSY : 0;

		return 0;



	rtl8169_check_link_status(dev, tp, tp->mmio_addr);

	return -EBUSY;

}

}





static const struct dev_pm_ops rtl8169_pm_ops = {

static const struct dev_pm_ops rtl8169_pm_ops = {