| From stable-owner@vger.kernel.org Sat Oct 6 06:49:16 2012 |
| From: Francois Romieu <romieu@fr.zoreil.com> |
| Date: Fri, 5 Oct 2012 23:29:17 +0200 |
| Subject: r8169: runtime resume before shutdown. |
| |
| |
| From: franรงois romieu <romieu@fr.zoreil.com> |
| |
| commit 2a15cd2ff488a9fdb55e5e34060f499853b27c77 upstream. |
| |
| With runtime PM, if the ethernet cable is disconnected, the device is |
| transitioned to D3 state to conserve energy. If the system is shutdown |
| in this state, any register accesses in rtl_shutdown are dropped on |
| the floor. As the device was programmed by .runtime_suspend() to wake |
| on link changes, it is thus brought back up as soon as the link recovers. |
| |
| Resuming every suspended device through the driver core would slow things |
| down and it is not clear how many devices really need it now. |
| |
| Original report and D0 transition patch by Sameer Nanda. Patch has been |
| changed to comply with advices by Rafael J. Wysocki and the PM folks. |
| |
| Reported-by: Sameer Nanda <snanda@chromium.org> |
| Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> |
| Cc: Rafael J. Wysocki <rjw@sisk.pl> |
| Cc: Hayes Wang <hayeswang@realtek.com> |
| Cc: Alan Stern <stern@rowland.harvard.edu> |
| Acked-by: Rafael J. Wysocki <rjw@sisk.pl> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/r8169.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/drivers/net/r8169.c |
| +++ b/drivers/net/r8169.c |
| @@ -5570,6 +5570,9 @@ static void rtl_shutdown(struct pci_dev |
| struct net_device *dev = pci_get_drvdata(pdev); |
| struct rtl8169_private *tp = netdev_priv(dev); |
| void __iomem *ioaddr = tp->mmio_addr; |
| + struct device *d = &pdev->dev; |
| + |
| + pm_runtime_get_sync(d); |
| |
| rtl8169_net_suspend(dev); |
| |
| @@ -5598,6 +5601,8 @@ static void rtl_shutdown(struct pci_dev |
| pci_wake_from_d3(pdev, true); |
| pci_set_power_state(pdev, PCI_D3hot); |
| } |
| + |
| + pm_runtime_put_noidle(d); |
| } |
| |
| static struct pci_driver rtl8169_pci_driver = { |