Commit 57ea3ab2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

Merge hibernation test mode fix for 6.4-rc1.

* pm-sleep:
  PM: hibernate: Do not get block device exclusively in test_resume mode
  PM: hibernate: Turn snapshot_test into global variable
parents bd446829 5904de0d

kernel/power/hibernate.c

+12 −3
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ enum { 
static int hibernation_mode = HIBERNATION_SHUTDOWN;



bool freezer_test_done;

bool snapshot_test;



static const struct platform_hibernation_ops *hibernation_ops;
@@ -687,18 +688,22 @@ static int load_image_and_restore(void) 
{

	int error;

	unsigned int flags;

	fmode_t mode = FMODE_READ;



	if (snapshot_test)

		mode |= FMODE_EXCL;



	pm_pr_dbg("Loading hibernation image.\n");



	lock_device_hotplug();

	error = create_basic_memory_bitmaps();

	if (error) {

		swsusp_close(FMODE_READ | FMODE_EXCL);

		swsusp_close(mode);

		goto Unlock;

	}



	error = swsusp_read(&flags);

	swsusp_close(FMODE_READ | FMODE_EXCL);

	swsusp_close(mode);

	if (!error)

		error = hibernation_restore(flags & SF_PLATFORM_MODE);
@@ -716,7 +721,6 @@ static int load_image_and_restore(void) 
 */

int hibernate(void)

{

	bool snapshot_test = false;

	unsigned int sleep_flags;

	int error;
@@ -744,6 +748,9 @@ int hibernate(void) 
	if (error)

		goto Exit;



	/* protected by system_transition_mutex */

	snapshot_test = false;



	lock_device_hotplug();

	/* Allocate memory management structures */

	error = create_basic_memory_bitmaps();
@@ -940,6 +947,8 @@ static int software_resume(void) 
	 */

	mutex_lock_nested(&system_transition_mutex, SINGLE_DEPTH_NESTING);



	snapshot_test = false;



	if (swsusp_resume_device)

		goto Check_image;

kernel/power/power.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ asmlinkage int swsusp_save(void); 


/* kernel/power/hibernate.c */

extern bool freezer_test_done;

extern bool snapshot_test;



extern int hibernation_snapshot(int platform_mode);

extern int hibernation_restore(int platform_mode);

kernel/power/swap.c

+6 −2
Original line number Diff line number Diff line
@@ -1518,9 +1518,13 @@ int swsusp_check(void) 
{

	int error;

	void *holder;

	fmode_t mode = FMODE_READ;



	if (snapshot_test)

		mode |= FMODE_EXCL;



	hib_resume_bdev = blkdev_get_by_dev(swsusp_resume_device,

					    FMODE_READ | FMODE_EXCL, &holder);

					    mode, &holder);

	if (!IS_ERR(hib_resume_bdev)) {

		set_blocksize(hib_resume_bdev, PAGE_SIZE);

		clear_page(swsusp_header);
@@ -1547,7 +1551,7 @@ int swsusp_check(void) 


put:

		if (error)

			blkdev_put(hib_resume_bdev, FMODE_READ | FMODE_EXCL);

			blkdev_put(hib_resume_bdev, mode);

		else

			pr_debug("Image signature found, resuming\n");

	} else {