Re: cpufreq suspend patch.

[Benjamin Herrenschmidt <benh@kernel.crashing.org>]

On Tue, 2005-08-09 at 09:53 +0100, David Woodhouse wrote:
> On Tue, 2005-08-09 at 10:32 +0200, Benjamin Herrenschmidt wrote:
> > Can you compare with what's currently upstream ? (I'm still travelling
> > around so it's more difficult for me).
> 
> It's very similar to what's upstream, but not identical. Your original
> patch has some extra changes in cpufreq_resume()...

Ah yes, I just reworked the if () statements to drift less to the right
iirc, no functional changes.

Ben.


>  static int cpufreq_resume(struct sys_device * sysdev)
>  {
>         int cpu = sysdev->id;
>         unsigned int ret = 0;
> +       unsigned int cur_freq = 0;
>         struct cpufreq_policy *cpu_policy;
>  
>         dprintk("resuming cpu %u\n", cpu);
> @@ -908,32 +988,34 @@
>                 }
>         }
>  
> -       if (!(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) {
> -               unsigned int cur_freq = 0;
> -
> -               if (cpufreq_driver->get)
> -                       cur_freq = cpufreq_driver->get(cpu_policy->cpu);
> -
> -               if (!cur_freq || !cpu_policy->cur) {
> -                       printk(KERN_ERR "cpufreq: resume failed to assert current frequency is what timing core thinks it is.\n");
> -                       goto out;
> -               }
> -
> -               if (unlikely(cur_freq != cpu_policy->cur)) {
> -                       struct cpufreq_freqs freqs;
> +       if (cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)
> +               goto out;
>  
> -                       printk(KERN_WARNING "Warning: CPU frequency is %u, "
> -                              "cpufreq assumed %u kHz.\n", cur_freq, cpu_policy->cur);
> +       if (cpufreq_driver->get)
> +               cur_freq = cpufreq_driver->get(cpu_policy->cpu);
>  
> -                       freqs.cpu = cpu;
> -                       freqs.old = cpu_policy->cur;
> -                       freqs.new = cur_freq;
> +       if (!cur_freq || !cpu_policy->cur) {
> +               printk(KERN_ERR "cpufreq: resume failed to assert current "
> +                      "frequency is what timing core thinks it is.\n");
> +               goto out;
> +       }
>  
> -                       notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_RESUMECHANGE, &freqs);
> -                       adjust_jiffies(CPUFREQ_RESUMECHANGE, &freqs);
> +       if (unlikely(cur_freq != cpu_policy->cur)) {
> +               struct cpufreq_freqs freqs;
>  
> -                       cpu_policy->cur = cur_freq;
> -               }
> +               if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
> +                       printk(KERN_DEBUG "Warning: CPU frequency is %u, "
> +                              "cpufreq assumed %u kHz.\n",
> +                              cur_freq, cpu_policy->cur);
> +
> +               freqs.cpu = cpu;
> +               freqs.old = cpu_policy->cur;
> +               freqs.new = cur_freq;
> +
> +               notifier_call_chain(&cpufreq_transition_notifier_list,
> +                                   CPUFREQ_RESUMECHANGE, &freqs);
> +               adjust_jiffies(CPUFREQ_RESUMECHANGE, &freqs);
> +               cpu_policy->cur = cur_freq;
>         }