Commit 0e3fb2a1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq' and 'pm-cpuidle' 

* pm-cpufreq:
  cpufreq: intel_pstate: Add one more OOB control bit

* pm-cpuidle:
  cpuidle: Rearrange s2idle-specific idle state entry code
  PM: s2idle: Clear _TIF_POLLING_NRFLAG before suspend to idle
parents 0659d420 589bab6b 10e8b11e

drivers/cpufreq/intel_pstate.c

+5 −2
Original line number Diff line number Diff line
@@ -2677,6 +2677,8 @@ static struct acpi_platform_list plat_info[] __initdata = { 
	{ } /* End */

};



#define BITMASK_OOB	(BIT(8) | BIT(18))



static bool __init intel_pstate_platform_pwr_mgmt_exists(void)

{

	const struct x86_cpu_id *id;
@@ -2686,8 +2688,9 @@ static bool __init intel_pstate_platform_pwr_mgmt_exists(void) 
	id = x86_match_cpu(intel_pstate_cpu_oob_ids);

	if (id) {

		rdmsrl(MSR_MISC_PWR_MGMT, misc_pwr);

		if (misc_pwr & (1 << 8)) {

			pr_debug("Bit 8 in the MISC_PWR_MGMT MSR set\n");

		if (misc_pwr & BITMASK_OOB) {

			pr_debug("Bit 8 or 18 in the MISC_PWR_MGMT MSR set\n");

			pr_debug("P states are controlled in Out of Band mode by the firmware/hardware\n");

			return true;

		}

	}

drivers/cpuidle/cpuidle.c

+3 −2
Original line number Diff line number Diff line
@@ -186,9 +186,10 @@ int cpuidle_enter_s2idle(struct cpuidle_driver *drv, struct cpuidle_device *dev) 
	 * be frozen safely.

	 */

	index = find_deepest_state(drv, dev, U64_MAX, 0, true);

	if (index > 0)

	if (index > 0) {

		enter_s2idle_proper(drv, dev, index);



		local_irq_enable();

	}

	return index;

}

#endif /* CONFIG_SUSPEND */

kernel/sched/idle.c

+11 −4
Original line number Diff line number Diff line
@@ -96,6 +96,15 @@ void __cpuidle default_idle_call(void) 
	}

}



static int call_cpuidle_s2idle(struct cpuidle_driver *drv,

			       struct cpuidle_device *dev)

{

	if (current_clr_polling_and_test())

		return -EBUSY;



	return cpuidle_enter_s2idle(drv, dev);

}



static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev,

		      int next_state)

{
@@ -171,11 +180,9 @@ static void cpuidle_idle_call(void) 
		if (idle_should_enter_s2idle()) {

			rcu_idle_enter();



			entered_state = cpuidle_enter_s2idle(drv, dev);

			if (entered_state > 0) {

				local_irq_enable();

			entered_state = call_cpuidle_s2idle(drv, dev);

			if (entered_state > 0)

				goto exit_idle;

			}



			rcu_idle_exit();