6.1-stable patches

added patches:
	pm-suspend-fix-pm_suspend_target_state-handling-for-config_pm.patch

diff --git a/queue-6.1/pm-suspend-fix-pm_suspend_target_state-handling-for-config_pm.patch b/queue-6.1/pm-suspend-fix-pm_suspend_target_state-handling-for-config_pm.patch
new file mode 100644 (file)
index 0000000..3ab255f
--- /dev/null
+++ b/queue-6.1/pm-suspend-fix-pm_suspend_target_state-handling-for-config_pm.patch
@@ -0,0 +1,64 @@
+From 2e41e3ca4729455e002bcb585f0d3749ee66d572 Mon Sep 17 00:00:00 2001
+From: Kai-Heng Feng <kai.heng.feng@canonical.com>
+Date: Tue, 2 May 2023 17:04:34 +0200
+Subject: PM: suspend: Fix pm_suspend_target_state handling for !CONFIG_PM
+
+From: Kai-Heng Feng <kai.heng.feng@canonical.com>
+
+commit 2e41e3ca4729455e002bcb585f0d3749ee66d572 upstream.
+
+Move the pm_suspend_target_state definition for CONFIG_SUSPEND
+unset from the wakeup code into the headers so as to allow it
+to still be used elsewhere when CONFIG_SUSPEND is not set.
+
+Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
+[ rjw: Changelog and subject edits ]
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/base/power/wakeup.c |    5 -----
+ include/linux/suspend.h     |    4 +++-
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+--- a/drivers/base/power/wakeup.c
++++ b/drivers/base/power/wakeup.c
+@@ -19,11 +19,6 @@
+ 
+ #include "power.h"
+ 
+-#ifndef CONFIG_SUSPEND
+-suspend_state_t pm_suspend_target_state;
+-#define pm_suspend_target_state       (PM_SUSPEND_ON)
+-#endif
+-
+ #define list_for_each_entry_rcu_locked(pos, head, member) \
+       list_for_each_entry_rcu(pos, head, member, \
+               srcu_read_lock_held(&wakeup_srcu))
+--- a/include/linux/suspend.h
++++ b/include/linux/suspend.h
+@@ -199,6 +199,7 @@ struct platform_s2idle_ops {
+ };
+ 
+ #ifdef CONFIG_SUSPEND
++extern suspend_state_t pm_suspend_target_state;
+ extern suspend_state_t mem_sleep_current;
+ extern suspend_state_t mem_sleep_default;
+ 
+@@ -334,6 +335,8 @@ extern bool sync_on_suspend_enabled;
+ #else /* !CONFIG_SUSPEND */
+ #define suspend_valid_only_mem        NULL
+ 
++#define pm_suspend_target_state       (PM_SUSPEND_ON)
++
+ static inline void pm_suspend_clear_flags(void) {}
+ static inline void pm_set_suspend_via_firmware(void) {}
+ static inline void pm_set_resume_via_firmware(void) {}
+@@ -498,7 +501,6 @@ extern void ksys_sync_helper(void);
+ 
+ /* drivers/base/power/wakeup.c */
+ extern bool events_check_enabled;
+-extern suspend_state_t pm_suspend_target_state;
+ 
+ extern bool pm_wakeup_pending(void);
+ extern void pm_system_wakeup(void);

diff --git a/queue-6.1/series b/queue-6.1/series
index 32fa436c85725668dba60712506fa3c25e149c88..cc44882dd07e0f15963f797fddf4c413a8d5bca5 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -326,6 +326,7 @@ rtc-rx8025-fix-incorrect-register-reference.patch
 smb-client-validate-change-notify-buffer-before-copy.patch
 lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch
 scsi-ufs-ufs-pci-fix-s0ix-s3-for-intel-controllers.patch
+pm-suspend-fix-pm_suspend_target_state-handling-for-config_pm.patch
 extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch
 drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch
 selftests-netdevsim-set-test-timeout-to-10-minutes.patch