Commit 524a3f2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "Stable-candidate fixes for the intel_pstate driver and the cpuidle
  core.

  Specifics:

   - Fix two intel_pstate initialization issues, one of which was
     introduced during the 4.4 cycle (Srinivas Pandruvada)

   - Fix kernel build with CONFIG_UBSAN set and CONFIG_CPU_IDLE unset
     (Catalin Marinas)"

* tag 'pm-4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: intel_pstate: Fix ->set_policy() interface for no_turbo
  cpufreq: intel_pstate: Fix code ordering in intel_pstate_set_policy()
  cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE
parents 9557c3cf 3681196a

drivers/cpufreq/intel_pstate.c

+9 −3
Original line number Diff line number Diff line
@@ -1460,6 +1460,9 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) 


	intel_pstate_clear_update_util_hook(policy->cpu);



	pr_debug("set_policy cpuinfo.max %u policy->max %u\n",

		 policy->cpuinfo.max_freq, policy->max);



	cpu = all_cpu_data[0];

	if (cpu->pstate.max_pstate_physical > cpu->pstate.max_pstate &&

	    policy->max < policy->cpuinfo.max_freq &&
@@ -1495,13 +1498,13 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) 
				   limits->max_sysfs_pct);

	limits->max_perf_pct = max(limits->min_policy_pct,

				   limits->max_perf_pct);

	limits->max_perf = round_up(limits->max_perf, FRAC_BITS);



	/* Make sure min_perf_pct <= max_perf_pct */

	limits->min_perf_pct = min(limits->max_perf_pct, limits->min_perf_pct);



	limits->min_perf = div_fp(limits->min_perf_pct, 100);

	limits->max_perf = div_fp(limits->max_perf_pct, 100);

	limits->max_perf = round_up(limits->max_perf, FRAC_BITS);



 out:

	intel_pstate_set_update_util_hook(policy->cpu);
@@ -1558,8 +1561,11 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy) 


	/* cpuinfo and default policy values */

	policy->cpuinfo.min_freq = cpu->pstate.min_pstate * cpu->pstate.scaling;

	policy->cpuinfo.max_freq =

		cpu->pstate.turbo_pstate * cpu->pstate.scaling;

	update_turbo_state();

	policy->cpuinfo.max_freq = limits->turbo_disabled ?

			cpu->pstate.max_pstate : cpu->pstate.turbo_pstate;

	policy->cpuinfo.max_freq *= cpu->pstate.scaling;



	intel_pstate_init_acpi_perf_limits(policy);

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	cpumask_set_cpu(policy->cpu, policy->cpus);

include/linux/cpuidle.h

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev); 
extern int cpuidle_play_dead(void);



extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev);

static inline struct cpuidle_device *cpuidle_get_device(void)

{return __this_cpu_read(cpuidle_devices); }

#else

static inline void disable_cpuidle(void) { }

static inline bool cpuidle_not_available(struct cpuidle_driver *drv,
@@ -187,6 +189,7 @@ static inline void cpuidle_disable_device(struct cpuidle_device *dev) { } 
static inline int cpuidle_play_dead(void) {return -ENODEV; }

static inline struct cpuidle_driver *cpuidle_get_cpu_driver(

	struct cpuidle_device *dev) {return NULL; }

static inline struct cpuidle_device *cpuidle_get_device(void) {return NULL; }

#endif



#if defined(CONFIG_CPU_IDLE) && defined(CONFIG_SUSPEND)

kernel/sched/idle.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev, 
 */

static void cpuidle_idle_call(void)

{

	struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);

	struct cpuidle_device *dev = cpuidle_get_device();

	struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);

	int next_state, entered_state;

CRA Git | Maintained and supported by SUSTech CRA and CCSE