Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'pm-fixes' 

* pm-fixes:
  cpufreq: s3c64xx: Rename index to driver_data
  intel_pstate: Fix type mismatch warning
  cpufreq / intel_pstate: Fix max_perf_pct on resume
parents 35f9162d 0e824432

drivers/cpufreq/intel_pstate.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -383,6 +383,7 @@ static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max) 
static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)

static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)

{

{

	int max_perf, min_perf;

	int max_perf, min_perf;

	u64 val;





	intel_pstate_get_min_max(cpu, &min_perf, &max_perf);

	intel_pstate_get_min_max(cpu, &min_perf, &max_perf);
@@ -394,11 +395,11 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate) 
	trace_cpu_frequency(pstate * 100000, cpu->cpu);

	trace_cpu_frequency(pstate * 100000, cpu->cpu);





	cpu->pstate.current_pstate = pstate;

	cpu->pstate.current_pstate = pstate;

	val = pstate << 8;

	if (limits.no_turbo)

	if (limits.no_turbo)

		wrmsrl(MSR_IA32_PERF_CTL, BIT(32) | (pstate << 8));

		val |= (u64)1 << 32;

	else

		wrmsrl(MSR_IA32_PERF_CTL, pstate << 8);





	wrmsrl(MSR_IA32_PERF_CTL, val);

}

}





static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)

static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)
@@ -637,8 +638,8 @@ static int intel_pstate_cpu_exit(struct cpufreq_policy *policy) 




static int intel_pstate_cpu_init(struct cpufreq_policy *policy)

static int intel_pstate_cpu_init(struct cpufreq_policy *policy)

{

{

	int rc, min_pstate, max_pstate;

	struct cpudata *cpu;

	struct cpudata *cpu;

	int rc;





	rc = intel_pstate_init_cpu(policy->cpu);

	rc = intel_pstate_init_cpu(policy->cpu);

	if (rc)

	if (rc)
@@ -652,9 +653,8 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy) 
	else

	else

		policy->policy = CPUFREQ_POLICY_POWERSAVE;

		policy->policy = CPUFREQ_POLICY_POWERSAVE;





	intel_pstate_get_min_max(cpu, &min_pstate, &max_pstate);

	policy->min = cpu->pstate.min_pstate * 100000;

	policy->min = min_pstate * 100000;

	policy->max = cpu->pstate.turbo_pstate * 100000;

	policy->max = max_pstate * 100000;





	/* cpuinfo and default policy values */

	/* cpuinfo and default policy values */

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

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

drivers/cpufreq/s3c64xx-cpufreq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -166,7 +166,7 @@ static void __init s3c64xx_cpufreq_config_regulator(void) 
		if (freq->frequency == CPUFREQ_ENTRY_INVALID)

		if (freq->frequency == CPUFREQ_ENTRY_INVALID)

			continue;

			continue;





		dvfs = &s3c64xx_dvfs_table[freq->index];

		dvfs = &s3c64xx_dvfs_table[freq->driver_data];

		found = 0;

		found = 0;





		for (i = 0; i < count; i++) {

		for (i = 0; i < count; i++) {