| Message ID | 1392617954-5292-4-git-send-email-chuansheng.liu@intel.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Monday, February 17, 2014 02:19:12 PM Chuansheng Liu wrote: > In analogy with commits 5af84b82701a and 97df8c12995, using > asynchronous threads can improve the overall resume_early > time significantly. > > This patch is for resume_early phase. > > Signed-off-by: Chuansheng Liu <chuansheng.liu@intel.com> > --- > drivers/base/power/main.c | 55 +++++++++++++++++++++++++++++++++++++---------- > 1 file changed, 44 insertions(+), 11 deletions(-) > > diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c > index 89172aa..2f2d110 100644 > --- a/drivers/base/power/main.c > +++ b/drivers/base/power/main.c > @@ -595,7 +595,7 @@ static void dpm_resume_noirq(pm_message_t state) > * > * Runtime PM is disabled for @dev while this function is being executed. > */ > -static int device_resume_early(struct device *dev, pm_message_t state) > +static int device_resume_early(struct device *dev, pm_message_t state, bool async) > { > pm_callback_t callback = NULL; > char *info = NULL; > @@ -607,6 +607,8 @@ static int device_resume_early(struct device *dev, pm_message_t state) > if (dev->power.syscore) > goto Out; > > + dpm_wait(dev->parent, async); > + If power.is_late_suspended is unset, you don't have to wait. > if (!dev->power.is_late_suspended) > goto Out; > > @@ -636,38 +638,69 @@ static int device_resume_early(struct device *dev, pm_message_t state) > TRACE_RESUME(error); > > pm_runtime_enable(dev); > + complete_all(&dev->power.completion); > return error; > } > > +static void async_resume_early(void *data, async_cookie_t cookie) > +{ > + struct device *dev = (struct device *)data; > + int error; > + > + error = device_resume_early(dev, pm_transition, true); > + if (error) > + pm_dev_err(dev, pm_transition, " async", error); > + > + put_device(dev); > +} > + > /** > * dpm_resume_early - Execute "early resume" callbacks for all devices. > * @state: PM transition of the system being carried out. > */ > static void dpm_resume_early(pm_message_t state) > { > + struct device *dev; > ktime_t starttime = ktime_get(); > > mutex_lock(&dpm_list_mtx); > - while (!list_empty(&dpm_late_early_list)) { > - struct device *dev = to_device(dpm_late_early_list.next); > - int error; > + pm_transition = state; > + > + /* > + * Advanced the async threads upfront, > + * in case the starting of async threads is > + * delayed by non-async resuming devices. > + */ > + list_for_each_entry(dev, &dpm_late_early_list, power.entry) { > + reinit_completion(&dev->power.completion); > + if (is_async(dev)) { > + get_device(dev); > + async_schedule(async_resume_early, dev); > + } > + } > > + while (!list_empty(&dpm_late_early_list)) { > + dev = to_device(dpm_late_early_list.next); > get_device(dev); > list_move_tail(&dev->power.entry, &dpm_suspended_list); > mutex_unlock(&dpm_list_mtx); > > - error = device_resume_early(dev, state); > - if (error) { > - suspend_stats.failed_resume_early++; > - dpm_save_failed_step(SUSPEND_RESUME_EARLY); > - dpm_save_failed_dev(dev_name(dev)); > - pm_dev_err(dev, state, " early", error); > - } > + if (!is_async(dev)) { > + int error; > > + error = device_resume_early(dev, state, false); > + if (error) { > + suspend_stats.failed_resume_early++; > + dpm_save_failed_step(SUSPEND_RESUME_EARLY); > + dpm_save_failed_dev(dev_name(dev)); > + pm_dev_err(dev, state, " early", error); > + } > + } > mutex_lock(&dpm_list_mtx); > put_device(dev); > } > mutex_unlock(&dpm_list_mtx); > + async_synchronize_full(); > dpm_show_time(starttime, state, "early"); > } > >
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 89172aa..2f2d110 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -595,7 +595,7 @@ static void dpm_resume_noirq(pm_message_t state) * * Runtime PM is disabled for @dev while this function is being executed. */ -static int device_resume_early(struct device *dev, pm_message_t state) +static int device_resume_early(struct device *dev, pm_message_t state, bool async) { pm_callback_t callback = NULL; char *info = NULL; @@ -607,6 +607,8 @@ static int device_resume_early(struct device *dev, pm_message_t state) if (dev->power.syscore) goto Out; + dpm_wait(dev->parent, async); + if (!dev->power.is_late_suspended) goto Out; @@ -636,38 +638,69 @@ static int device_resume_early(struct device *dev, pm_message_t state) TRACE_RESUME(error); pm_runtime_enable(dev); + complete_all(&dev->power.completion); return error; } +static void async_resume_early(void *data, async_cookie_t cookie) +{ + struct device *dev = (struct device *)data; + int error; + + error = device_resume_early(dev, pm_transition, true); + if (error) + pm_dev_err(dev, pm_transition, " async", error); + + put_device(dev); +} + /** * dpm_resume_early - Execute "early resume" callbacks for all devices. * @state: PM transition of the system being carried out. */ static void dpm_resume_early(pm_message_t state) { + struct device *dev; ktime_t starttime = ktime_get(); mutex_lock(&dpm_list_mtx); - while (!list_empty(&dpm_late_early_list)) { - struct device *dev = to_device(dpm_late_early_list.next); - int error; + pm_transition = state; + + /* + * Advanced the async threads upfront, + * in case the starting of async threads is + * delayed by non-async resuming devices. + */ + list_for_each_entry(dev, &dpm_late_early_list, power.entry) { + reinit_completion(&dev->power.completion); + if (is_async(dev)) { + get_device(dev); + async_schedule(async_resume_early, dev); + } + } + while (!list_empty(&dpm_late_early_list)) { + dev = to_device(dpm_late_early_list.next); get_device(dev); list_move_tail(&dev->power.entry, &dpm_suspended_list); mutex_unlock(&dpm_list_mtx); - error = device_resume_early(dev, state); - if (error) { - suspend_stats.failed_resume_early++; - dpm_save_failed_step(SUSPEND_RESUME_EARLY); - dpm_save_failed_dev(dev_name(dev)); - pm_dev_err(dev, state, " early", error); - } + if (!is_async(dev)) { + int error; + error = device_resume_early(dev, state, false); + if (error) { + suspend_stats.failed_resume_early++; + dpm_save_failed_step(SUSPEND_RESUME_EARLY); + dpm_save_failed_dev(dev_name(dev)); + pm_dev_err(dev, state, " early", error); + } + } mutex_lock(&dpm_list_mtx); put_device(dev); } mutex_unlock(&dpm_list_mtx); + async_synchronize_full(); dpm_show_time(starttime, state, "early"); }
In analogy with commits 5af84b82701a and 97df8c12995, using asynchronous threads can improve the overall resume_early time significantly. This patch is for resume_early phase. Signed-off-by: Chuansheng Liu <chuansheng.liu@intel.com> --- drivers/base/power/main.c | 55 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 11 deletions(-)