Commit 355c63e5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-assorted' 

* pm-assorted:
  PM / OPP: add documentation to RCU head in struct opp
  PM / sleep: invalidate TEST_CPUS and TEST_CORE support for freeze state
  PM / sleep: add TEST_PLATFORM support for freeze state
parents 0acaab53 cd787b34

drivers/base/power/opp.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
 * @rate:	Frequency in hertz

 * @u_volt:	Nominal voltage in microvolts corresponding to this OPP

 * @dev_opp:	points back to the device_opp struct this opp belongs to

 * @head:	RCU callback head used for deferred freeing

 *

 * This structure stores the OPP information for a given device.

 */

kernel/power/suspend.c

+17 −5
Original line number Diff line number Diff line
@@ -76,8 +76,20 @@ EXPORT_SYMBOL_GPL(suspend_set_ops); 


bool valid_state(suspend_state_t state)

{

	if (state == PM_SUSPEND_FREEZE)

	if (state == PM_SUSPEND_FREEZE) {

#ifdef CONFIG_PM_DEBUG

		if (pm_test_level != TEST_NONE &&

		    pm_test_level != TEST_FREEZER &&

		    pm_test_level != TEST_DEVICES &&

		    pm_test_level != TEST_PLATFORM) {

			printk(KERN_WARNING "Unsupported pm_test mode for "

					"freeze state, please choose "

					"none/freezer/devices/platform.\n");

			return false;

		}

#endif

			return true;

	}

	/*

	 * PM_SUSPEND_STANDBY and PM_SUSPEND_MEMORY states need lowlevel

	 * support and need to be valid to the lowlevel
@@ -184,6 +196,9 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) 
			goto Platform_wake;

	}



	if (suspend_test(TEST_PLATFORM))

		goto Platform_wake;



	/*

	 * PM_SUSPEND_FREEZE equals

	 * frozen processes + suspended devices + idle processors.
@@ -195,9 +210,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) 
		goto Platform_wake;

	}



	if (suspend_test(TEST_PLATFORM))

		goto Platform_wake;



	error = disable_nonboot_cpus();

	if (error || suspend_test(TEST_CPUS))

		goto Enable_cpus;