e100: adapt to the reworked PCI PM
Subsystems (2)
PATCH 1/10 e100: adapt to the reworked PCI PM
From: "Rafael J. Wysocki" <[email protected]>
Adapt the e100 driver to the reworked PCI PM
* Use device_set_wakeup_enable() and friends as needed
* Use pci_pme_active() to clear PME_Status and disable PME#
* Use the observation that it is sufficient to call pci_enable_wake() once, unless it fails
---
drivers/net/e100.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/net/e100.c renamed from drivers/net/e100.c~e100-adapt-to-the-reworked-pci-pm +10 -6
@@ -2211,7 +2211,8 @@ static int e100_set_wol(struct net_devic {struct nic *nic =netdev_priv (netdev); -if (wol->wolopts !=WAKE_MAGIC && wol->wolopts !=0 ) +if ((wol->wolopts && wol->wolopts !=WAKE_MAGIC ) || + !device_can_wakeup (&nic->pdev->dev))return -EOPNOTSUPP ;if (wol->wolopts)
@@ -2219,6 +2220,8 @@ static int e100_set_wol(struct net_devicelse nic->flags &= ~wol_magic; +device_set_wakeup_enable (&nic->pdev->dev, wol->wolopts); +e100_exec_cb (nic,NULL , e100_configure);return 0 ;
@@ -2623,8 +2626,10 @@ static int __devinit e100_probe(struct p/* Wol magic packet can be enabled from eeprom */ if ((nic->mac >= mac_82558_D101_A4) && - (nic->eeprom[eeprom_id] & eeprom_id_wol)) + (nic->eeprom[eeprom_id] & eeprom_id_wol)) { nic->flags |= wol_magic; +device_set_wakeup_enable (&pdev->dev, true); + }/* ack any pending wake events, disable PME */ pci_pme_active (pdev, false);
@@ -2683,11 +2688,10 @@ static int e100_suspend(struct pci_dev *pci_save_state (pdev);if ((nic->flags & wol_magic) |e100_asf (nic)) { -pci_enable_wake (pdev, PCI_D3hot,1 ); -pci_enable_wake (pdev, PCI_D3cold,1 ); +if (pci_enable_wake (pdev, PCI_D3cold, true)) +pci_enable_wake (pdev, PCI_D3hot, true); }else { -pci_enable_wake (pdev, PCI_D3hot,0 ); -pci_enable_wake (pdev, PCI_D3cold,0 ); +pci_enable_wake (pdev, PCI_D3hot, false); }pci_disable_device (pdev);
_
Quoted 6 lines · On Monday, 22 of September 2008, [email protected] wrote:
From: "Rafael J. Wysocki" <[email protected]>
Adapt the e100 driver to the reworked PCI PM
* Use
device_set_wakeup_enable()and friends as needed
* Usepci_pme_active()to clearPME_Statusand disable PME#
Well, this part has already been merged. :-)
Quoted 2 lines
* Use the observation that it is sufficient to call
pci_enable_wake()once, unless it fails
The rest wouldn't hurt in .27, but it can wait for .28 just as well IMO.
Quoted 64 lines
Signed-off-by Rafael J. Wysocki <[email protected]>Tested-by Jeff Kirsher <[email protected]>Acked-by Jeff Kirsher <[email protected]>Cc Jesse Barnes <[email protected]>Cc Jeff Garzik <[email protected]>Cc Frans Pop <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/net/e100.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)diff -puN
drivers/net/e100.c~e100-adapt-to-the-reworked-pci-pmdrivers/net/e100.cdrivers/net/e100.c renamed from drivers/net/e100.c~e100-adapt-to-the-reworked-pci-pm +10
-6@@ -2211,7 +2211,8 @@ static int e100_set_wol(struct net_devic {struct nic *nic =netdev_priv (netdev); -if (wol->wolopts !=WAKE_MAGIC && wol->wolopts !=0 ) +if ((wol->wolopts && wol->wolopts !=WAKE_MAGIC ) || + !device_can_wakeup (&nic->pdev->dev))return -EOPNOTSUPP ;if (wol->wolopts)@@ -2219,6 +2220,8 @@ static int e100_set_wol(struct net_devicelse nic->flags &= ~wol_magic; +device_set_wakeup_enable (&nic->pdev->dev, wol->wolopts); +e100_exec_cb (nic,NULL , e100_configure);return 0 ;@@ -2623,8 +2626,10 @@ static int __devinit e100_probe(struct p/* Wol magic packet can be enabled from eeprom */ if ((nic->mac >= mac_82558_D101_A4) && - (nic->eeprom[eeprom_id] & eeprom_id_wol)) + (nic->eeprom[eeprom_id] & eeprom_id_wol)) { nic->flags |= wol_magic; +device_set_wakeup_enable (&pdev->dev, true); + }/* ack any pending wake events, disable PME */ pci_pme_active (pdev, false);@@ -2683,11 +2688,10 @@ static int e100_suspend(struct pci_dev *pci_save_state (pdev);if ((nic->flags & wol_magic) |e100_asf (nic)) { -pci_enable_wake (pdev, PCI_D3hot,1 ); -pci_enable_wake (pdev, PCI_D3cold,1 ); +if (pci_enable_wake (pdev, PCI_D3cold, true)) +pci_enable_wake (pdev, PCI_D3hot, true); }else { -pci_enable_wake (pdev, PCI_D3hot,0 ); -pci_enable_wake (pdev, PCI_D3cold,0 ); +pci_enable_wake (pdev, PCI_D3hot, false); }pci_disable_device (pdev);_