ARM64: tegra: Move LP0 error message

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: Ib7f1b27b4d6ca20f1d52e95d0046774ce74d3b89
Signed-off-by: Sai Gurrappadi <sgurrappadi@nvidia.com>
Reviewed-on: http://git-master/r/427264
Signed-off-by: Peng Du <pdu@nvidia.com>
Reviewed-on: http://git-master/r/441523
GVS: Gerrit_Virtual_Submit
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>

diff --git a/arch/arm64/mach-tegra/pm-tegra132.c b/arch/arm64/mach-tegra/pm-tegra132.c
index a3b7b3e383a1d813b669ef39df38959ad03c9ffe..2248aeab6d5fba569814bf471136e6445a12e573 100644 (file)
--- a/arch/arm64/mach-tegra/pm-tegra132.c
+++ b/arch/arm64/mach-tegra/pm-tegra132.c
@@ -207,15 +207,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;