Merge back earlier cpufreq material for 6.16
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 19 Apr 2025 10:49:00 +0000 (12:49 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 19 Apr 2025 10:49:00 +0000 (12:49 +0200)
1  2 
drivers/cpufreq/amd-pstate.c
drivers/cpufreq/cpufreq.c
drivers/cpufreq/intel_pstate.c

index b961f3a3b58059691ad169ed265b08fddf9f60d0,b9d59c7425f5dc100e6137588cfb1b705e89aadd..99ebe14a72230d9b70a204b87aef7ff1ede2cbdd
@@@ -804,13 -811,18 +804,12 @@@ static void amd_pstate_init_prefcore(st
  
        cpudata->hw_prefcore = true;
  
 -      /*
 -       * The priorities can be set regardless of whether or not
 -       * sched_set_itmt_support(true) has been called and it is valid to
 -       * update them at any time after it has been called.
 -       */
 +      /* Priorities must be initialized before ITMT support can be toggled on. */
        sched_set_itmt_core_prio((int)READ_ONCE(cpudata->prefcore_ranking), cpudata->cpu);
 -
 -      schedule_work(&sched_prefcore_work);
  }
  
- static void amd_pstate_update_limits(unsigned int cpu)
+ static void amd_pstate_update_limits(struct cpufreq_policy *policy)
  {
-       struct cpufreq_policy *policy __free(put_cpufreq_policy) = cpufreq_cpu_get(cpu);
        struct amd_cpudata *cpudata;
        u32 prev_high = 0, cur_high = 0;
        bool highest_perf_changed = false;
Simple merge
Simple merge