Skip to content

Commit 86b84bd

Browse files
committed
Merge branch 'pm-sleep'
Merge changes related to system-wide power management for 6.9-rc1: - Fix and clean up system suspend statistics collection (Rafael Wysocki). - Simplify device suspend and resume handling in the power management core code (Rafael Wysocki). - Add support for LZ4 compression algorithm to the hibernation image creation and loading code (Nikhil V). - Fix PCI hibernation support description (Yiwei Lin). - Make hibernation take set_memory_ro() return values into account as appropriate (Christophe Leroy). - Set mem_sleep_current during kernel command line setup to avoid an ordering issue with handling it (Maulik Shah). - Fix wake IRQs handling when pm_runtime_force_suspend() is used as a driver's system suspend callback (Qingliang Li). * pm-sleep: (21 commits) PM: sleep: wakeirq: fix wake irq warning in system suspend PM: suspend: Set mem_sleep_current during kernel command line setup PM: hibernate: Don't ignore return from set_memory_ro() PM: hibernate: Support to select compression algorithm Documentation: PM: Fix PCI hibernation support description PM: hibernate: Add support for LZ4 compression for hibernation PM: hibernate: Move to crypto APIs for LZO compression PM: hibernate: Rename lzo* to make it generic PM: sleep: Call dpm_async_fn() directly in each suspend phase PM: sleep: Move devices to new lists earlier in each suspend phase PM: sleep: Move some assignments from under a lock PM: sleep: stats: Log errors right after running suspend callbacks PM: sleep: stats: Use locking in dpm_save_failed_dev() PM: sleep: stats: Call dpm_save_failed_step() at most once per phase PM: sleep: stats: Define suspend_stats next to the code using it PM: sleep: stats: Use unsigned int for success and failure counters PM: sleep: stats: Use an array of step failure counters PM: sleep: stats: Use array of suspend step names PM: sleep: Relocate two device PM core functions PM: sleep: Simplify dpm_suspended_list walk in dpm_resume() ...
2 parents f0a0fc1 + e7a7681 commit 86b84bd

File tree

14 files changed

+569
-392
lines changed

14 files changed

+569
-392
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,6 +1748,17 @@
17481748
(that will set all pages holding image data
17491749
during restoration read-only).
17501750

1751+
hibernate.compressor= [HIBERNATION] Compression algorithm to be
1752+
used with hibernation.
1753+
Format: { lzo | lz4 }
1754+
Default: lzo
1755+
1756+
lzo: Select LZO compression algorithm to
1757+
compress/decompress hibernation image.
1758+
1759+
lz4: Select LZ4 compression algorithm to
1760+
compress/decompress hibernation image.
1761+
17511762
highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
17521763
size of <nn>. This works even on boxes that have no
17531764
highmem otherwise. This also works to reduce highmem

Documentation/power/pci.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ The PCI subsystem-level callbacks they correspond to::
625625
pci_pm_poweroff()
626626
pci_pm_poweroff_noirq()
627627

628-
work in analogy with pci_pm_suspend() and pci_pm_poweroff_noirq(), respectively,
628+
work in analogy with pci_pm_suspend() and pci_pm_suspend_noirq(), respectively,
629629
although they don't attempt to save the device's standard configuration
630630
registers.
631631

0 commit comments

Comments
 (0)