ARM64: tegra: Move LP0 error message
Sai Gurrappadi [Mon, 23 Jun 2014 18:43:15 +0000 (11:43 -0700)]
Moved the LP0 error message that complains about CPU1 not being up on
LP0 entry (cpu_up failed) to a more appropriate location.

Bug 1522953

Change-Id: I9cfa7800779a621ca4563c6aefa7a7b2054ebe4b
Signed-off-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/427264
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Peng Du <pdu@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>

arch/arm64/mach-tegra/pm.c

index 36626d0..b8c8d33 100644 (file)
@@ -768,15 +768,16 @@ static int __cpuinit pm_suspend_notifier(struct notifier_block *nb,
                if (!cpu)
                        continue;
                ret = cpu_up(cpu);
-               if (ret)
-                       pr_warn("%s: Couldn't bring up CPU%d on LP0 entry\n",
-                                       __func__, cpu);
+
                /*
                 * Error in getting CPU out of C6. Let -EINVAL through as CPU
                 * could have come online
                 */
-               if (ret && ret != -EINVAL)
+               if (ret && ret != -EINVAL) {
+                       pr_err("%s: Couldn't bring up CPU%d on LP0 entry: %d\n",
+                                       __func__, cpu, ret);
                        return NOTIFY_BAD;
+               }
        }
 
        return NOTIFY_OK;