Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: cpufreq-cpu0: remove dependency on THERMAL and REGULATOR
  cpufreq: tegra: update comment for clarity
  cpufreq: intel_pstate: Remove duplicate CPU ID check
  cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
  cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'
  cpufreq: governor: Be friendly towards latency-sensitive bursty workloads
  cpufreq: ppc-corenet-cpu-freq: do_div use quotient
  Revert "cpufreq: Enable big.LITTLE cpufreq driver on arm64"
  cpufreq: Tegra: implement intermediate frequency callbacks
  cpufreq: add support for intermediate (stable) frequencies

1 files changed, 25 insertions, 0 deletions

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 3f458896d45c..ec4112d257bc 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -75,6 +75,7 @@ struct cpufreq_policy {
         unsigned int            max;    /* in kHz */
         unsigned int            cur;    /* in kHz, only needed if cpufreq
                                          * governors are used */
+        unsigned int            restore_freq; /* = policy->cur before transition */
         unsigned int            suspend_freq; /* freq to set during suspend */
 
         unsigned int            policy; /* see above */
@@ -221,11 +222,35 @@ struct cpufreq_driver {
 
         /* define one out of two */
         int     (*setpolicy)    (struct cpufreq_policy *policy);
+
+        /*
+         * On failure, should always restore frequency to policy->restore_freq
+         * (i.e. old freq).
+         */
         int     (*target)       (struct cpufreq_policy *policy, /* Deprecated */
                                  unsigned int target_freq,
                                  unsigned int relation);
         int     (*target_index) (struct cpufreq_policy *policy,
                                  unsigned int index);
+        /*
+         * Only for drivers with target_index() and CPUFREQ_ASYNC_NOTIFICATION
+         * unset.
+         *
+         * get_intermediate should return a stable intermediate frequency
+         * platform wants to switch to and target_intermediate() should set CPU
+         * to to that frequency, before jumping to the frequency corresponding
+         * to 'index'. Core will take care of sending notifications and driver
+         * doesn't have to handle them in target_intermediate() or
+         * target_index().
+         *
+         * Drivers can return '0' from get_intermediate() in case they don't
+         * wish to switch to intermediate frequency for some target frequency.
+         * In that case core will directly call ->target_index().
+         */
+        unsigned int (*get_intermediate)(struct cpufreq_policy *policy,
+                                         unsigned int index);
+        int     (*target_intermediate)(struct cpufreq_policy *policy,
+                                       unsigned int index);
 
         /* should be defined, if possible */
         unsigned int    (*get)  (unsigned int cpu);