Skip to content

Commit 16691e9

Browse files
committed
Merge branch 'pm-cpufreq' into linux-next
* pm-cpufreq: cpufreq: Force sync policy boost with global boost on sysfs update cpufreq: Preserve policy's boost state after resume cpufreq: Introduce policy_set_boost() cpufreq: Don't unnecessarily call set_boost() cpufreq: Drop unused cpufreq_get_policy() cpufreq: Pass policy pointer to ->update_limits() cpufreq: Introduce cpufreq_policy_refresh() cpufreq: Use __free() for policy reference counting cleanup cpufreq: Drop cpufreq_cpu_acquire() and cpufreq_cpu_release() cpufreq: Use locking guard and __free() in cpufreq_update_policy() cpufreq: intel_pstate: Rearrange max frequency updates handling code cpufreq: Add and use cpufreq policy locking guards cpufreq: Split cpufreq_online() cpufreq: Consolidate some code in cpufreq_online()
2 parents c3b21ba + 121baab commit 16691e9

4 files changed

Lines changed: 208 additions & 281 deletions

File tree

drivers/cpufreq/amd-pstate.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -808,19 +808,16 @@ static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)
808808
sched_set_itmt_core_prio((int)READ_ONCE(cpudata->prefcore_ranking), cpudata->cpu);
809809
}
810810

811-
static void amd_pstate_update_limits(unsigned int cpu)
811+
static void amd_pstate_update_limits(struct cpufreq_policy *policy)
812812
{
813-
struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
814813
struct amd_cpudata *cpudata;
815814
u32 prev_high = 0, cur_high = 0;
816815
bool highest_perf_changed = false;
816+
unsigned int cpu = policy->cpu;
817817

818818
if (!amd_pstate_prefcore)
819819
return;
820820

821-
if (!policy)
822-
return;
823-
824821
if (amd_get_highest_perf(cpu, &cur_high))
825822
return;
826823

0 commit comments

Comments
 (0)