| Message ID | 20191014230016.240912-7-helgaas@kernel.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | PCI: PM: Move to D0 before calling pci_legacy_resume_early() | expand |
On Tuesday, October 15, 2019 1:00:15 AM CEST Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > Documentation/power/pci.rst is wrapped to fit in 80 columns, but directory > structure changes made a few lines longer. Wrap them so they all fit in 80 > columns again. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Well, looks better this way. :-) Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > Documentation/power/pci.rst | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/Documentation/power/pci.rst b/Documentation/power/pci.rst > index 1525c594d631..db41a770a2f5 100644 > --- a/Documentation/power/pci.rst > +++ b/Documentation/power/pci.rst > @@ -426,12 +426,12 @@ pm->runtime_idle() callback. > 2.4. System-Wide Power Transitions > ---------------------------------- > There are a few different types of system-wide power transitions, described in > -Documentation/driver-api/pm/devices.rst. Each of them requires devices to be handled > -in a specific way and the PM core executes subsystem-level power management > -callbacks for this purpose. They are executed in phases such that each phase > -involves executing the same subsystem-level callback for every device belonging > -to the given subsystem before the next phase begins. These phases always run > -after tasks have been frozen. > +Documentation/driver-api/pm/devices.rst. Each of them requires devices to be > +handled in a specific way and the PM core executes subsystem-level power > +management callbacks for this purpose. They are executed in phases such that > +each phase involves executing the same subsystem-level callback for every device > +belonging to the given subsystem before the next phase begins. These phases > +always run after tasks have been frozen. > > 2.4.1. System Suspend > ^^^^^^^^^^^^^^^^^^^^^ > @@ -636,12 +636,12 @@ System restore requires a hibernation image to be loaded into memory and the > pre-hibernation memory contents to be restored before the pre-hibernation system > activity can be resumed. > > -As described in Documentation/driver-api/pm/devices.rst, the hibernation image is loaded > -into memory by a fresh instance of the kernel, called the boot kernel, which in > -turn is loaded and run by a boot loader in the usual way. After the boot kernel > -has loaded the image, it needs to replace its own code and data with the code > -and data of the "hibernated" kernel stored within the image, called the image > -kernel. For this purpose all devices are frozen just like before creating > +As described in Documentation/driver-api/pm/devices.rst, the hibernation image > +is loaded into memory by a fresh instance of the kernel, called the boot kernel, > +which in turn is loaded and run by a boot loader in the usual way. After the > +boot kernel has loaded the image, it needs to replace its own code and data with > +the code and data of the "hibernated" kernel stored within the image, called the > +image kernel. For this purpose all devices are frozen just like before creating > the image during hibernation, in the > > prepare, freeze, freeze_noirq > @@ -691,8 +691,8 @@ controlling the runtime power management of their devices. > > At the time of this writing there are two ways to define power management > callbacks for a PCI device driver, the recommended one, based on using a > -dev_pm_ops structure described in Documentation/driver-api/pm/devices.rst, and the > -"legacy" one, in which the .suspend(), .suspend_late(), .resume_early(), and > +dev_pm_ops structure described in Documentation/driver-api/pm/devices.rst, and > +the "legacy" one, in which the .suspend(), .suspend_late(), .resume_early(), and > .resume() callbacks from struct pci_driver are used. The legacy approach, > however, doesn't allow one to define runtime power management callbacks and is > not really suitable for any new drivers. Therefore it is not covered by this >
diff --git a/Documentation/power/pci.rst b/Documentation/power/pci.rst index 1525c594d631..db41a770a2f5 100644 --- a/Documentation/power/pci.rst +++ b/Documentation/power/pci.rst @@ -426,12 +426,12 @@ pm->runtime_idle() callback. 2.4. System-Wide Power Transitions ---------------------------------- There are a few different types of system-wide power transitions, described in -Documentation/driver-api/pm/devices.rst. Each of them requires devices to be handled -in a specific way and the PM core executes subsystem-level power management -callbacks for this purpose. They are executed in phases such that each phase -involves executing the same subsystem-level callback for every device belonging -to the given subsystem before the next phase begins. These phases always run -after tasks have been frozen. +Documentation/driver-api/pm/devices.rst. Each of them requires devices to be +handled in a specific way and the PM core executes subsystem-level power +management callbacks for this purpose. They are executed in phases such that +each phase involves executing the same subsystem-level callback for every device +belonging to the given subsystem before the next phase begins. These phases +always run after tasks have been frozen. 2.4.1. System Suspend ^^^^^^^^^^^^^^^^^^^^^ @@ -636,12 +636,12 @@ System restore requires a hibernation image to be loaded into memory and the pre-hibernation memory contents to be restored before the pre-hibernation system activity can be resumed. -As described in Documentation/driver-api/pm/devices.rst, the hibernation image is loaded -into memory by a fresh instance of the kernel, called the boot kernel, which in -turn is loaded and run by a boot loader in the usual way. After the boot kernel -has loaded the image, it needs to replace its own code and data with the code -and data of the "hibernated" kernel stored within the image, called the image -kernel. For this purpose all devices are frozen just like before creating +As described in Documentation/driver-api/pm/devices.rst, the hibernation image +is loaded into memory by a fresh instance of the kernel, called the boot kernel, +which in turn is loaded and run by a boot loader in the usual way. After the +boot kernel has loaded the image, it needs to replace its own code and data with +the code and data of the "hibernated" kernel stored within the image, called the +image kernel. For this purpose all devices are frozen just like before creating the image during hibernation, in the prepare, freeze, freeze_noirq @@ -691,8 +691,8 @@ controlling the runtime power management of their devices. At the time of this writing there are two ways to define power management callbacks for a PCI device driver, the recommended one, based on using a -dev_pm_ops structure described in Documentation/driver-api/pm/devices.rst, and the -"legacy" one, in which the .suspend(), .suspend_late(), .resume_early(), and +dev_pm_ops structure described in Documentation/driver-api/pm/devices.rst, and +the "legacy" one, in which the .suspend(), .suspend_late(), .resume_early(), and .resume() callbacks from struct pci_driver are used. The legacy approach, however, doesn't allow one to define runtime power management callbacks and is not really suitable for any new drivers. Therefore it is not covered by this