1 files changed, 26 insertions, 5 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index c6291ab725a3..b1b58260b4ff 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -46,6 +46,7 @@ LIST_HEAD(dpm_prepared_list);
 LIST_HEAD(dpm_suspended_list);
 LIST_HEAD(dpm_noirq_list);
 
+struct suspend_stats suspend_stats;
 static DEFINE_MUTEX(dpm_list_mtx);
 static pm_message_t pm_transition;
 
@@ -467,8 +468,12 @@ void dpm_resume_noirq(pm_message_t state)
                 mutex_unlock(&dpm_list_mtx);
 
                 error = device_resume_noirq(dev, state);
-                if (error)
+                if (error) {
+                        suspend_stats.failed_resume_noirq++;
+                        dpm_save_failed_step(SUSPEND_RESUME_NOIRQ);
+                        dpm_save_failed_dev(dev_name(dev));
                         pm_dev_err(dev, state, " early", error);
+                }
 
                 mutex_lock(&dpm_list_mtx);
                 put_device(dev);
@@ -629,8 +634,12 @@ void dpm_resume(pm_message_t state)
                         mutex_unlock(&dpm_list_mtx);
 
                         error = device_resume(dev, state, false);
-                        if (error)
+                        if (error) {
+                                suspend_stats.failed_resume++;
+                                dpm_save_failed_step(SUSPEND_RESUME);
+                                dpm_save_failed_dev(dev_name(dev));
                                 pm_dev_err(dev, state, "", error);
+                        }
 
                         mutex_lock(&dpm_list_mtx);
                 }
@@ -805,6 +814,9 @@ int dpm_suspend_noirq(pm_message_t state)
                 mutex_lock(&dpm_list_mtx);
                 if (error) {
                         pm_dev_err(dev, state, " late", error);
+                        suspend_stats.failed_suspend_noirq++;
+                        dpm_save_failed_step(SUSPEND_SUSPEND_NOIRQ);
+                        dpm_save_failed_dev(dev_name(dev));
                         put_device(dev);
                         break;
                 }
@@ -926,8 +938,10 @@ static void async_suspend(void *data, async_cookie_t cookie)
         int error;
 
         error = __device_suspend(dev, pm_transition, true);
-        if (error)
+        if (error) {
+                dpm_save_failed_dev(dev_name(dev));
                 pm_dev_err(dev, pm_transition, " async", error);
+        }
 
         put_device(dev);
 }
@@ -970,6 +984,7 @@ int dpm_suspend(pm_message_t state)
                 mutex_lock(&dpm_list_mtx);
                 if (error) {
                         pm_dev_err(dev, state, "", error);
+                        dpm_save_failed_dev(dev_name(dev));
                         put_device(dev);
                         break;
                 }
@@ -983,7 +998,10 @@ int dpm_suspend(pm_message_t state)
         async_synchronize_full();
         if (!error)
                 error = async_error;
-        if (!error)
+        if (error) {
+                suspend_stats.failed_suspend++;
+                dpm_save_failed_step(SUSPEND_SUSPEND);
+        } else
                 dpm_show_time(starttime, state, NULL);
         return error;
 }
@@ -1091,7 +1109,10 @@ int dpm_suspend_start(pm_message_t state)
         int error;
 
         error = dpm_prepare(state);
-        if (!error)
+        if (error) {
+                suspend_stats.failed_prepare++;
+                dpm_save_failed_step(SUSPEND_PREPARE);
+        } else
                 error = dpm_suspend(state);
         return error;
 }