hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

de2104x: fix power management 

At least my 21041 cards come out of suspend with bus mastering disabled so
they did not work after resume(no data transferred).
After adding pci_set_master(), the driver oopsed immediately on resume -
because de_clean_rings() is called on suspend but de_init_rings() call
was missing in resume.

Also disable link (reset SIA) before sleep (de4x5 does this too).

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ondrej Zary 2010-09-24 23:57:02 +00:00 committed by David S. Miller
parent e0f9c4f332
commit b0255a0235
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/tulip/de2104x.c
View File

@ -1231,6 +1231,7 @@ static void de_adapter_sleep (struct de_private *de)
if (de->de21040) if (de->de21040)
return; return;
dw32(CSR13, 0); /* Reset phy */
pci_read_config_dword(de->pdev, PCIPM, &pmctl); pci_read_config_dword(de->pdev, PCIPM, &pmctl);
pmctl |= PM_Sleep; pmctl |= PM_Sleep;
pci_write_config_dword(de->pdev, PCIPM, pmctl); pci_write_config_dword(de->pdev, PCIPM, pmctl);
@ -2166,6 +2167,8 @@ static int de_resume (struct pci_dev *pdev)
dev_err(&dev->dev, "pci_enable_device failed in resume\n"); dev_err(&dev->dev, "pci_enable_device failed in resume\n");
goto out; goto out;
} }
pci_set_master(pdev);
de_init_rings(de);
de_init_hw(de); de_init_hw(de);
out_attach: out_attach:
netif_device_attach(dev); netif_device_attach(dev);