| Message ID | 20191014230016.240912-3-helgaas@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: PM: Move to D0 before calling pci_legacy_resume_early() | expand |
On Tuesday, October 15, 2019 1:00:11 AM CEST Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > According to the documentation, pci_pm_thaw_noirq() did not put the device > into the full-power state and restore its standard configuration registers. > This is incorrect, so update the documentation to match the code. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Right, the documentation is outdated, so Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > Documentation/power/pci.rst | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/Documentation/power/pci.rst b/Documentation/power/pci.rst > index 0e2ef7429304..1525c594d631 100644 > --- a/Documentation/power/pci.rst > +++ b/Documentation/power/pci.rst > @@ -600,17 +600,17 @@ using the following PCI bus type's callbacks:: > > respectively. > > -The first of them, pci_pm_thaw_noirq(), is analogous to pci_pm_resume_noirq(), > -but it doesn't put the device into the full power state and doesn't attempt to > -restore its standard configuration registers. It also executes the device > -driver's pm->thaw_noirq() callback, if defined, instead of pm->resume_noirq(). > +The first of them, pci_pm_thaw_noirq(), is analogous to pci_pm_resume_noirq(). > +It puts the device into the full power state and restores its standard > +configuration registers. It also executes the device driver's pm->thaw_noirq() > +callback, if defined, instead of pm->resume_noirq(). > > The pci_pm_thaw() routine is similar to pci_pm_resume(), but it runs the device > driver's pm->thaw() callback instead of pm->resume(). It is executed > asynchronously for different PCI devices that don't depend on each other in a > known way. > > -The complete phase it the same as for system resume. > +The complete phase is the same as for system resume. > > After saving the image, devices need to be powered down before the system can > enter the target sleep state (ACPI S4 for ACPI-based systems). This is done in >
diff --git a/Documentation/power/pci.rst b/Documentation/power/pci.rst index 0e2ef7429304..1525c594d631 100644 --- a/Documentation/power/pci.rst +++ b/Documentation/power/pci.rst @@ -600,17 +600,17 @@ using the following PCI bus type's callbacks:: respectively. -The first of them, pci_pm_thaw_noirq(), is analogous to pci_pm_resume_noirq(), -but it doesn't put the device into the full power state and doesn't attempt to -restore its standard configuration registers. It also executes the device -driver's pm->thaw_noirq() callback, if defined, instead of pm->resume_noirq(). +The first of them, pci_pm_thaw_noirq(), is analogous to pci_pm_resume_noirq(). +It puts the device into the full power state and restores its standard +configuration registers. It also executes the device driver's pm->thaw_noirq() +callback, if defined, instead of pm->resume_noirq(). The pci_pm_thaw() routine is similar to pci_pm_resume(), but it runs the device driver's pm->thaw() callback instead of pm->resume(). It is executed asynchronously for different PCI devices that don't depend on each other in a known way. -The complete phase it the same as for system resume. +The complete phase is the same as for system resume. After saving the image, devices need to be powered down before the system can enter the target sleep state (ACPI S4 for ACPI-based systems). This is done in