diff options
| author | Nathan Bryant <nbryant@optonline.net> | 2005-01-10 17:16:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-10 17:16:48 -0800 |
| commit | 58abf9b1d26a55163b5bff01b4ca7320a8472bab (patch) | |
| tree | 06c90cc49d8853eded7c8ec52e715e86e1c84e6e /drivers | |
| parent | 3fe02ac184102dbf0e791be8c16d33f9bab945af (diff) | |
| download | history-58abf9b1d26a55163b5bff01b4ca7320a8472bab.tar.gz | |
[PATCH] 3c59x: enable power management unconditionally
The problem is that under the new PCI driver model, cards are required to
always restore state and call pci_enable_device() on resume. So the patch
changes the driver to do its restore state calls unconditionally (it used
to only do them when it was configured for wake-on-lan) and adds a call to
pci_enable_device().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/3c59x.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 59a55a18387147..64e3fe0375c39a 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c @@ -1493,7 +1493,7 @@ static int __devinit vortex_probe1(struct device *gendev, #ifdef CONFIG_NET_POLL_CONTROLLER dev->poll_controller = poll_vortex; #endif - if (pdev && vp->enable_wol) { + if (pdev) { vp->pm_state_valid = 1; pci_save_state(VORTEX_PCI(vp)); acpi_set_WOL(dev); @@ -1550,9 +1550,10 @@ vortex_up(struct net_device *dev) unsigned int config; int i; - if (VORTEX_PCI(vp) && vp->enable_wol) { + if (VORTEX_PCI(vp)) { pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */ pci_restore_state(VORTEX_PCI(vp)); + pci_enable_device(VORTEX_PCI(vp)); } /* Before initializing select the active media port. */ @@ -2708,7 +2709,7 @@ vortex_down(struct net_device *dev, int final_down) if (vp->full_bus_master_tx) outl(0, ioaddr + DownListPtr); - if (final_down && VORTEX_PCI(vp) && vp->enable_wol) { + if (final_down && VORTEX_PCI(vp)) { pci_save_state(VORTEX_PCI(vp)); acpi_set_WOL(dev); } @@ -3133,15 +3134,17 @@ static void acpi_set_WOL(struct net_device *dev) struct vortex_private *vp = netdev_priv(dev); long ioaddr = dev->base_addr; - /* Power up on: 1==Downloaded Filter, 2==Magic Packets, 4==Link Status. */ - EL3WINDOW(7); - outw(2, ioaddr + 0x0c); - /* The RxFilter must accept the WOL frames. */ - outw(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD); - outw(RxEnable, ioaddr + EL3_CMD); + if (vp->enable_wol) { + /* Power up on: 1==Downloaded Filter, 2==Magic Packets, 4==Link Status. */ + EL3WINDOW(7); + outw(2, ioaddr + 0x0c); + /* The RxFilter must accept the WOL frames. */ + outw(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD); + outw(RxEnable, ioaddr + EL3_CMD); + pci_enable_wake(VORTEX_PCI(vp), 0, 1); + } /* Change the power state to D3; RxEnable doesn't take effect. */ - pci_enable_wake(VORTEX_PCI(vp), 0, 1); pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot); } @@ -3164,7 +3167,7 @@ static void __devexit vortex_remove_one (struct pci_dev *pdev) */ unregister_netdev(dev); - if (VORTEX_PCI(vp) && vp->enable_wol) { + if (VORTEX_PCI(vp)) { pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */ if (vp->pm_state_valid) pci_restore_state(VORTEX_PCI(vp)); |