Pull power management updates from Rafael Wysocki: "The most signigicant change here is the addition of a new cpufreq 'P-state' driver for AMD processors as a better replacement for the venerable acpi-cpufreq driver. There are also other cpufreq updates (in the core, intel_pstate, ARM drivers), PM core updates (mostly related to adding new macros for declaring PM operations which should make the lives of driver developers somewhat easier), and a bunch of assorted fixes and cleanups. Summary: - Add new P-state driver for AMD processors (Huang Rui). - Fix initialization of min and max frequency QoS requests in the cpufreq core (Rafael Wysocki). - Fix EPP handling on Alder Lake in intel_pstate (Srinivas Pandruvada). - Make intel_pstate update cpuinfo.max_freq when notified of HWP capabilities changes and drop a redundant function call from that driver (Rafael Wysocki). - Improve IRQ support in the Qcom cpufreq driver (Ard Biesheuvel, Stephen Boyd, Vladimir Zapolskiy). - Fix double devm_remap() in the Mediatek cpufreq driver (Hector Yuan). - Introduce thermal pressure helpers for cpufreq CPU cooling (Lukasz Luba). - Make cpufreq use default_groups in kobj_type (Greg Kroah-Hartman). - Make cpuidle use default_groups in kobj_type (Greg Kroah-Hartman). - Fix two comments in cpuidle code (Jason Wang, Yang Li). - Allow model-specific normal EPB value to be used in the intel_epb sysfs attribute handling code (Srinivas Pandruvada). - Simplify locking in pm_runtime_put_suppliers() (Rafael Wysocki). - Add safety net to supplier device release in the runtime PM core code (Rafael Wysocki). - Capture device status before disabling runtime PM for it (Rafael Wysocki). - Add new macros for declaring PM operations to allow drivers to avoid guarding them with CONFIG_PM #ifdefs or __maybe_unused and update some drivers to use these macros (Paul Cercueil). - Allow ACPI hardware signature to be honoured during restore from hibernation (David Woodhouse). - Update outdated operating performance points (OPP) documentation (Tang Yizhou). - Reduce log severity for informative message regarding frequency transition failures in devfreq (Tzung-Bi Shih). - Add DRAM frequency controller devfreq driver for Allwinner sunXi SoCs (Samuel Holland). - Add missing COMMON_CLK dependency to sun8i devfreq driver (Arnd Bergmann). - Add support for new layout of Psys PowerLimit Register on SPR to the Intel RAPL power capping driver (Zhang Rui). - Fix typo in a comment in idle_inject.c (Jason Wang). - Remove unused function definition from the DTPM (Dynamit Thermal Power Management) power capping framework (Daniel Lezcano). - Reduce DTPM trace verbosity (Daniel Lezcano)" * tag 'pm-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (53 commits) x86, sched: Fix undefined reference to init_freq_invariance_cppc() build error cpufreq: amd-pstate: Fix Kconfig dependencies for AMD P-State cpufreq: amd-pstate: Fix struct amd_cpudata kernel-doc comment cpuidle: use default_groups in kobj_type x86: intel_epb: Allow model specific normal EPB value MAINTAINERS: Add AMD P-State driver maintainer entry Documentation: amd-pstate: Add AMD P-State driver introduction cpufreq: amd-pstate: Add AMD P-State performance attributes cpufreq: amd-pstate: Add AMD P-State frequencies attributes cpufreq: amd-pstate: Add boost mode support for AMD P-State cpufreq: amd-pstate: Add trace for AMD P-State module cpufreq: amd-pstate: Introduce the support for the processors with shared memory solution cpufreq: amd-pstate: Add fast switch function for AMD P-State cpufreq: amd-pstate: Introduce a new AMD P-State driver to support future processors ACPI: CPPC: Add CPPC enable register function ACPI: CPPC: Check present CPUs for determining _CPC is valid ACPI: CPPC: Implement support for SystemIO registers x86/msr: Add AMD CPPC MSR definitions x86/cpufeatures: Add AMD Collaborative Processor Performance Control feature flag cpufreq: use default_groups in kobj_type ...
Showing the changes to kernel (2 of 55 files). Show all
Unified · Split
| @@ -170,6 +170,7 @@ extern int swsusp_swap_in_use(void); · 169 unmodified lines | ||
| 170 | 170 | #define SF_PLATFORM_MODE 1 |
| 171 | 171 | #define SF_NOCOMPRESS_MODE 2 |
| 172 | 172 | #define SF_CRC32_MODE 4 |
| 173 | +#define SF_HW_SIG 8 | |
| 173 | 174 | |
| 174 | 175 | /* kernel/power/hibernate.c */ |
| 175 | 176 | extern int swsusp_check(void); |
| @@ -36,6 +36,8 @@ · 35 unmodified lines | ||
| 36 | 36 | |
| 37 | 37 | #define HIBERNATE_SIG "S1SUSPEND" |
| 38 | 38 | |
| 39 | +u32 swsusp_hardware_signature; | |
| 40 | + | |
| 39 | 41 | /* |
| 40 | 42 | * When reading an {un,}compressed image, we may restore pages in place, |
| 41 | 43 | * in which case some architectures need these pages cleaning before they |
| @@ -104,7 +106,8 @@ struct swap_map_handle { · 62 unmodified lines | ||
| 104 | 106 | |
| 105 | 107 | struct swsusp_header { |
| 106 | 108 | char reserved[PAGE_SIZE - 20 - sizeof(sector_t) - sizeof(int) - |
| 107 | − sizeof(u32)]; | |
| 109 | + sizeof(u32) - sizeof(u32)]; | |
| 110 | + u32 hw_sig; | |
| 108 | 111 | u32 crc32; |
| 109 | 112 | sector_t image; |
| 110 | 113 | unsigned int flags; /* Flags to pass to the "boot" kernel */ |
| @@ -312,7 +315,6 @@ static int hib_wait_io(struct hib_bio_batch *hb) · 201 unmodified lines | ||
| 312 | 315 | /* |
| 313 | 316 | * Saving part |
| 314 | 317 | */ |
| 315 | − | |
| 316 | 318 | static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags) |
| 317 | 319 | { |
| 318 | 320 | int error; |
| @@ -324,6 +326,10 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags) · 5 unmodified lines | ||
| 324 | 326 | memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10); |
| 325 | 327 | memcpy(swsusp_header->sig, HIBERNATE_SIG, 10); |
| 326 | 328 | swsusp_header->image = handle->first_sector; |
| 329 | + if (swsusp_hardware_signature) { | |
| 330 | + swsusp_header->hw_sig = swsusp_hardware_signature; | |
| 331 | + flags |= SF_HW_SIG; | |
| 332 | + } | |
| 327 | 333 | swsusp_header->flags = flags; |
| 328 | 334 | if (flags & SF_CRC32_MODE) |
| 329 | 335 | swsusp_header->crc32 = handle->crc32; |
| @@ -1537,6 +1543,12 @@ int swsusp_check(void) · 1207 unmodified lines | ||
| 1537 | 1543 | } else { |
| 1538 | 1544 | error = -EINVAL; |
| 1539 | 1545 | } |
| 1546 | + if (!error && swsusp_header->flags & SF_HW_SIG && | |
| 1547 | + swsusp_header->hw_sig != swsusp_hardware_signature) { | |
| 1548 | + pr_info("Suspend image hardware signature mismatch (%08x now %08x); aborting resume.\n", | |
| 1549 | + swsusp_header->hw_sig, swsusp_hardware_signature); | |
| 1550 | + error = -EINVAL; | |
| 1551 | + } | |
| 1540 | 1552 | |
| 1541 | 1553 | put: |
| 1542 | 1554 | if (error) |