On Monday, February 17, 2014 02:55:08 PM Viresh Kumar wrote: > Previous patch added support for suspending governors, with callbacks being > called from dpm_{suspend|resume}_noirq(). The problem here is that most of the > devices (i.e. devices with ->suspend() callbacks) have already been suspended by > now and so if drivers want to change frequency before suspending, then it might > not be possible for many platforms (which depend on other peripherals like i2c, > regulators, etc). > > So, we actually need to do this from dpm_{suspend|resume}() instead. This patch > does it. Please fold this into [1/7]. > Tested-by: Lan Tianyu <tianyu.lan@xxxxxxxxx> > Tested-by: Nishanth Menon <nm@xxxxxx> > Tested-by: Stephen Warren <swarren@xxxxxxxxxx> > Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx> > --- > drivers/base/power/main.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c > index da49882..0f82012 100644 > --- a/drivers/base/power/main.c > +++ b/drivers/base/power/main.c > @@ -582,7 +582,6 @@ static void dpm_resume_noirq(pm_message_t state) > dpm_show_time(starttime, state, "noirq"); > resume_device_irqs(); > cpuidle_resume(); > - cpufreq_resume(); > } > > /** > @@ -858,6 +857,8 @@ void dpm_resume(pm_message_t state) > mutex_unlock(&dpm_list_mtx); > async_synchronize_full(); > dpm_show_time(starttime, state, NULL); > + > + cpufreq_resume(); > } > > /** > @@ -1063,7 +1064,6 @@ static int dpm_suspend_noirq(pm_message_t state) > ktime_t starttime = ktime_get(); > int error = 0; > > - cpufreq_suspend(); > cpuidle_pause(); > suspend_device_irqs(); > mutex_lock(&dpm_list_mtx); > @@ -1415,6 +1415,8 @@ int dpm_suspend(pm_message_t state) > > might_sleep(); > > + cpufreq_suspend(); > + > mutex_lock(&dpm_list_mtx); > pm_transition = state; > async_error = 0; > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe cpufreq" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html