From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 13 Nov 2017 00:34:14 +0000 (+0100)
Subject: Merge branch 'pm-cpuidle'
X-Git-Tag: Ubuntu-5.2.0-15.16~5619^2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=622ade3a2ff0fc4c026f116ea6018eddaeb49925;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'pm-cpuidle'

* pm-cpuidle:
  intel_idle: Graceful probe failure when MWAIT is disabled
  cpuidle: Avoid assignment in if () argument
  cpuidle: Clean up cpuidle_enable_device() error handling a bit
  cpuidle: ladder: Add per CPU PM QoS resume latency support
  ARM: cpuidle: Refactor rollback operations if init fails
  ARM: cpuidle: Correct driver unregistration if init fails
  intel_idle: replace conditionals with static_cpu_has(X86_FEATURE_ARAT)
  cpuidle: fix broadcast control when broadcast can not be entered

 Conflicts:
	drivers/idle/intel_idle.c
---

622ade3a2ff0fc4c026f116ea6018eddaeb49925
diff --cc drivers/idle/intel_idle.c
index f0b06b14e782,9c93abdf635f..b2ccce5fb071
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@@ -913,19 -913,24 +913,25 @@@ static __cpuidle int intel_idle(struct 
  	struct cpuidle_state *state = &drv->states[index];
  	unsigned long eax = flg2MWAIT(state->flags);
  	unsigned int cstate;
+ 	bool uninitialized_var(tick);
 +	int cpu = smp_processor_id();
  
- 	cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1;
- 
  	/*
 -	 * NB: if CPUIDLE_FLAG_TLB_FLUSHED is set, this idle transition
 -	 * will probably flush the TLB.  It's not guaranteed to flush
 -	 * the TLB, though, so it's not clear that we can do anything
 -	 * useful with this knowledge.
 +	 * leave_mm() to avoid costly and often unnecessary wakeups
 +	 * for flushing the user TLB's associated with the active mm.
  	 */
 +	if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED)
 +		leave_mm(cpu);
  
- 	if (!(lapic_timer_reliable_states & (1 << (cstate))))
- 		tick_broadcast_enter();
+ 	if (!static_cpu_has(X86_FEATURE_ARAT)) {
+ 		cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) &
+ 				MWAIT_CSTATE_MASK) + 1;
+ 		tick = false;
+ 		if (!(lapic_timer_reliable_states & (1 << (cstate)))) {
+ 			tick = true;
+ 			tick_broadcast_enter();
+ 		}
+ 	}
  
  	mwait_idle_with_hints(eax, ecx);