USB: fix up suspend and resume for PCI host controllers
authorAlan Stern <stern@rowland.harvard.edu>
Wed, 17 Dec 2008 20:06:03 +0000 (15:06 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 7 Jan 2009 18:00:12 +0000 (10:00 -0800)
commita0d4922da2e4ccb0973095d8d29f36f6b1b5f703
tree511e023051c2d217c336c965bd384646108de100
parenta81a81a25d3ecdab777abca87c5ddf484056103d
USB: fix up suspend and resume for PCI host controllers

This patch (as1192) rearranges the USB PCI host controller suspend and
resume and resume routines:

Use pci_wake_from_d3() for enabling and disabling wakeup,
instead of pci_enable_wake().

Carry out the actual state change while interrupts are
disabled.

Change the order of the preparations to agree with the
general recommendation for PCI devices, instead of
messing around with the wakeup settings while the device
is in D3.

In .suspend:
Call the underlying driver to disable IRQ
generation;
pci_wake_from_d3(device_may_wakeup());
pci_disable_device();

In .suspend_late:
pci_save_state();
pci_set_power_state(D3hot);
(for PPC_PMAC) Disable ASIC clocks

In .resume_early:
(for PPC_PMAC) Enable ASIC clocks
pci_set_power_state(D0);
pci_restore_state();

In .resume:
pci_enable_device();
pci_set_master();
pci_wake_from_d3(0);
Call the underlying driver to reenable IRQ
generation

Add the necessary .suspend_late and .resume_early method
pointers to the PCI host controller drivers.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/core/hcd-pci.c
drivers/usb/core/hcd.h
drivers/usb/host/ehci-pci.c
drivers/usb/host/ohci-pci.c
drivers/usb/host/uhci-hcd.c