iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM: sleep: stats: Log errors right after running suspend callbacks

Browse Source 
The error logging and failure statistics updates are carried out in two
places in each system-wide device suspend phase, which is unnecessary
code duplication, so do that in one place in each phase, right after
invoking device suspend callbacks.

While at it, add "noirq" or "late" to the "async" string printed when
the failing device callback in the "noirq" or "late" suspend phase,
respectively, was run asynchronously.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Rafael J. Wysocki 2024-01-29 17:25:48 +01:00
parent a6d38e991d
commit ac6f87aaa2
1 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/base/power/main.c
View File

@ -1244,6 +1244,8 @@ Run:
error = dpm_run_callback(callback, dev, state, info); error = dpm_run_callback(callback, dev, state, info);
if (error) { if (error) {
async_error = error; async_error = error;
dpm_save_failed_dev(dev_name(dev));
pm_dev_err(dev, state, async ? " async noirq" : " noirq", error);
goto Complete; goto Complete;
} }
@ -1273,14 +1275,8 @@ Complete:
static void async_suspend_noirq(void *data, async_cookie_t cookie) static void async_suspend_noirq(void *data, async_cookie_t cookie)
{ {
struct device *dev = data; struct device *dev = data;
int error;
error = __device_suspend_noirq(dev, pm_transition, true);
if (error) {
dpm_save_failed_dev(dev_name(dev));
pm_dev_err(dev, pm_transition, " async", error);
}
__device_suspend_noirq(dev, pm_transition, true);
put_device(dev); put_device(dev);
} }
@ -1312,12 +1308,8 @@ static int dpm_noirq_suspend_devices(pm_message_t state)
mutex_lock(&dpm_list_mtx); mutex_lock(&dpm_list_mtx);
if (error) { if (!error && !list_empty(&dev->power.entry))
pm_dev_err(dev, state, " noirq", error);
dpm_save_failed_dev(dev_name(dev));
} else if (!list_empty(&dev->power.entry)) {
list_move(&dev->power.entry, &dpm_noirq_list); list_move(&dev->power.entry, &dpm_noirq_list);
}
mutex_unlock(&dpm_list_mtx); mutex_unlock(&dpm_list_mtx);
@ -1437,6 +1429,8 @@ Run:
error = dpm_run_callback(callback, dev, state, info); error = dpm_run_callback(callback, dev, state, info);
if (error) { if (error) {
async_error = error; async_error = error;
dpm_save_failed_dev(dev_name(dev));
pm_dev_err(dev, state, async ? " async late" : " late", error);
goto Complete; goto Complete;
} }
dpm_propagate_wakeup_to_parent(dev); dpm_propagate_wakeup_to_parent(dev);
@ -1453,13 +1447,8 @@ Complete:
static void async_suspend_late(void *data, async_cookie_t cookie) static void async_suspend_late(void *data, async_cookie_t cookie)
{ {
struct device *dev = data; struct device *dev = data;
int error;
error = __device_suspend_late(dev, pm_transition, true); __device_suspend_late(dev, pm_transition, true);
if (error) {
dpm_save_failed_dev(dev_name(dev));
pm_dev_err(dev, pm_transition, " async", error);
}
put_device(dev); put_device(dev);
} }
@ -1500,11 +1489,6 @@ int dpm_suspend_late(pm_message_t state)
if (!list_empty(&dev->power.entry)) if (!list_empty(&dev->power.entry))
list_move(&dev->power.entry, &dpm_late_early_list); list_move(&dev->power.entry, &dpm_late_early_list);
if (error) {
pm_dev_err(dev, state, " late", error);
dpm_save_failed_dev(dev_name(dev));
}
mutex_unlock(&dpm_list_mtx); mutex_unlock(&dpm_list_mtx);
put_device(dev); put_device(dev);
@ -1719,8 +1703,11 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
dpm_watchdog_clear(&wd); dpm_watchdog_clear(&wd);
Complete: Complete:
if (error) if (error) {
async_error = error; async_error = error;
dpm_save_failed_dev(dev_name(dev));
pm_dev_err(dev, state, async ? " async" : "", error);
}
complete_all(&dev->power.completion); complete_all(&dev->power.completion);
TRACE_SUSPEND(error); TRACE_SUSPEND(error);
@ -1730,14 +1717,8 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
static void async_suspend(void *data, async_cookie_t cookie) static void async_suspend(void *data, async_cookie_t cookie)
{ {
struct device *dev = data; struct device *dev = data;
int error;
error = __device_suspend(dev, pm_transition, true);
if (error) {
dpm_save_failed_dev(dev_name(dev));
pm_dev_err(dev, pm_transition, " async", error);
}
__device_suspend(dev, pm_transition, true);
put_device(dev); put_device(dev);
} }
@ -1778,12 +1759,8 @@ int dpm_suspend(pm_message_t state)
mutex_lock(&dpm_list_mtx); mutex_lock(&dpm_list_mtx);
if (error) { if (!error && !list_empty(&dev->power.entry))
pm_dev_err(dev, state, "", error);
dpm_save_failed_dev(dev_name(dev));
} else if (!list_empty(&dev->power.entry)) {
list_move(&dev->power.entry, &dpm_suspended_list); list_move(&dev->power.entry, &dpm_suspended_list);
}
mutex_unlock(&dpm_list_mtx); mutex_unlock(&dpm_list_mtx);