cpufreq: interactive: keep freezer happy when not current governor
authorSam Leffler <sleffler@chromium.org>
Wed, 27 Jun 2012 19:55:56 +0000 (12:55 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 16 Feb 2016 21:52:41 +0000 (13:52 -0800)
Fix a problem where the hung task mechanism was deeming the interactive
clock boost thread as hung.  This was because the thread is created at
module init but never run/woken up until needed.  If the governor is not
being used this can be forever.  To workaround this explicitly wake up
the thread once all the necessary data structures are initialized.  The
latter required some minor code shuffle.

Signed-off-by: Sam Leffler <sleffler@chromium.org>
Change-Id: Ie2c058dd75dcb6460ea10e7ac997e46baf66b1fe

drivers/cpufreq/cpufreq_interactive.c

index 20389918e66cacbf9f327803efd1f4e8977f7acf..184140aabda25ae9838d19e0eb766ce33f3beacc 100644 (file)
@@ -953,6 +953,10 @@ static int __init cpufreq_interactive_init(void)
                pcpu->cpu_timer.data = i;
        }
 
+       spin_lock_init(&up_cpumask_lock);
+       spin_lock_init(&down_cpumask_lock);
+       mutex_init(&set_speed_lock);
+
        up_task = kthread_create(cpufreq_interactive_up_task, NULL,
                                 "kinteractiveup");
        if (IS_ERR(up_task))
@@ -968,14 +972,12 @@ static int __init cpufreq_interactive_init(void)
        if (!down_wq)
                goto err_freeuptask;
 
-       INIT_WORK(&freq_scale_down_work,
-                 cpufreq_interactive_freq_down);
+       INIT_WORK(&freq_scale_down_work, cpufreq_interactive_freq_down);
+       INIT_WORK(&inputopen.inputopen_work, cpufreq_interactive_input_open);
 
-       spin_lock_init(&up_cpumask_lock);
-       spin_lock_init(&down_cpumask_lock);
-       mutex_init(&set_speed_lock);
+       /* NB: wake up so the thread does not look hung to the freezer */
+       wake_up_process(up_task);
 
-       INIT_WORK(&inputopen.inputopen_work, cpufreq_interactive_input_open);
        return cpufreq_register_governor(&cpufreq_gov_interactive);
 
 err_freeuptask: