OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PM: hibernate: Turn snapshot_test into global variable 

There is need to check snapshot_test and open block device
in different mode, so as to avoid the race condition.

No functional changes intended.

Suggested-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Chen Yu 2023-04-14 20:10:26 +08:00 committed by Rafael J. Wysocki
parent 0cfd8703e7
commit 08169a162f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/power/hibernate.c
View File

@ -64,6 +64,7 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN; static int hibernation_mode = HIBERNATION_SHUTDOWN;
bool freezer_test_done; bool freezer_test_done;
bool snapshot_test;
static const struct platform_hibernation_ops *hibernation_ops; static const struct platform_hibernation_ops *hibernation_ops;
@ -716,7 +717,6 @@ static int load_image_and_restore(void)
*/ */
int hibernate(void) int hibernate(void)
{ {
bool snapshot_test = false;
unsigned int sleep_flags; unsigned int sleep_flags;
int error; int error;
@ -744,6 +744,9 @@ int hibernate(void)
if (error) if (error)
goto Exit; goto Exit;
/* protected by system_transition_mutex */
snapshot_test = false;
lock_device_hotplug(); lock_device_hotplug();
/* Allocate memory management structures */ /* Allocate memory management structures */
error = create_basic_memory_bitmaps(); error = create_basic_memory_bitmaps();
@ -940,6 +943,8 @@ static int software_resume(void)
*/ */
mutex_lock_nested(&system_transition_mutex, SINGLE_DEPTH_NESTING); mutex_lock_nested(&system_transition_mutex, SINGLE_DEPTH_NESTING);
snapshot_test = false;
if (swsusp_resume_device) if (swsusp_resume_device)
goto Check_image; goto Check_image;

1
kernel/power/power.h
View File

@ -59,6 +59,7 @@ asmlinkage int swsusp_save(void);
/* kernel/power/hibernate.c */ /* kernel/power/hibernate.c */
extern bool freezer_test_done; extern bool freezer_test_done;
extern bool snapshot_test;
extern int hibernation_snapshot(int platform_mode); extern int hibernation_snapshot(int platform_mode);
extern int hibernation_restore(int platform_mode); extern int hibernation_restore(int platform_mode);