r8169: do not bring device down when suspending
Stopping all activity through ChipCmd and blindly acking the irqs is neither nice nor completely needed: the transition to low-power mode does enough work and it apparently keeps the device in a sane state. Patch suggested by a fix for http://bugzilla.kernel.org/show_bug.cgi?id=9512 The rtl_shutdown path is kept unchanged so far. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Tested-by: Anders Eriksson <aeriksson@fastmail.fm> Cc: Edward Hsu <edward_hsu@realtek.com.tw> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
c2f3f3a2fe
Коммит
4bb3f52207
|
@ -3811,22 +3811,11 @@ static struct net_device_stats *rtl8169_get_stats(struct net_device *dev)
|
||||||
|
|
||||||
static void rtl8169_net_suspend(struct net_device *dev)
|
static void rtl8169_net_suspend(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct rtl8169_private *tp = netdev_priv(dev);
|
|
||||||
void __iomem *ioaddr = tp->mmio_addr;
|
|
||||||
|
|
||||||
if (!netif_running(dev))
|
if (!netif_running(dev))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
netif_device_detach(dev);
|
netif_device_detach(dev);
|
||||||
netif_stop_queue(dev);
|
netif_stop_queue(dev);
|
||||||
|
|
||||||
spin_lock_irq(&tp->lock);
|
|
||||||
|
|
||||||
rtl8169_asic_down(ioaddr);
|
|
||||||
|
|
||||||
rtl8169_rx_missed(dev, ioaddr);
|
|
||||||
|
|
||||||
spin_unlock_irq(&tp->lock);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
|
@ -3876,9 +3865,17 @@ static struct dev_pm_ops rtl8169_pm_ops = {
|
||||||
static void rtl_shutdown(struct pci_dev *pdev)
|
static void rtl_shutdown(struct pci_dev *pdev)
|
||||||
{
|
{
|
||||||
struct net_device *dev = pci_get_drvdata(pdev);
|
struct net_device *dev = pci_get_drvdata(pdev);
|
||||||
|
struct rtl8169_private *tp = netdev_priv(dev);
|
||||||
|
void __iomem *ioaddr = tp->mmio_addr;
|
||||||
|
|
||||||
rtl8169_net_suspend(dev);
|
rtl8169_net_suspend(dev);
|
||||||
|
|
||||||
|
spin_lock_irq(&tp->lock);
|
||||||
|
|
||||||
|
rtl8169_asic_down(ioaddr);
|
||||||
|
|
||||||
|
spin_unlock_irq(&tp->lock);
|
||||||
|
|
||||||
if (system_state == SYSTEM_POWER_OFF) {
|
if (system_state == SYSTEM_POWER_OFF) {
|
||||||
pci_wake_from_d3(pdev, true);
|
pci_wake_from_d3(pdev, true);
|
||||||
pci_set_power_state(pdev, PCI_D3hot);
|
pci_set_power_state(pdev, PCI_D3hot);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче