| Message ID | 1398126646-29518-1-git-send-email-sebastian.capella@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2c730785d9532d2a9c46e059bd6a6c9a764c539f |
| Headers | show |
On Mon 2014-04-21 17:30:46, Sebastian Capella wrote: > Reboot logic in kernel/reboot will avoid calling kernel_power_off > when pm_power_off is null, and instead uses kernel_halt. Change > hibernate's power_down to follow the behavior in the reboot call. > > Calling the notifier twice (once for SYS_POWER_OFF and again for > SYS_HALT) causes a panic during hibernation on Kirkwood > Openblocks A6 board. > > Signed-off-by: Sebastian Capella <sebastian.capella@linaro.org> > Reported-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > Cc: Len Brown <len.brown@intel.com> Reviewed-by: Pavel Machek <pavel@ucw.cz>
On Tuesday, April 22, 2014 09:09:55 AM Pavel Machek wrote: > On Mon 2014-04-21 17:30:46, Sebastian Capella wrote: > > Reboot logic in kernel/reboot will avoid calling kernel_power_off > > when pm_power_off is null, and instead uses kernel_halt. Change > > hibernate's power_down to follow the behavior in the reboot call. > > > > Calling the notifier twice (once for SYS_POWER_OFF and again for > > SYS_HALT) causes a panic during hibernation on Kirkwood > > Openblocks A6 board. > > > > Signed-off-by: Sebastian Capella <sebastian.capella@linaro.org> > > Reported-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > Cc: Len Brown <len.brown@intel.com> > > Reviewed-by: Pavel Machek <pavel@ucw.cz> Queued up for 3.16, thanks!
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index f4f2073..7642932 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -595,7 +595,8 @@ static void power_down(void) case HIBERNATION_PLATFORM: hibernation_platform_enter(); case HIBERNATION_SHUTDOWN: - kernel_power_off(); + if (pm_power_off) + kernel_power_off(); break; #ifdef CONFIG_SUSPEND case HIBERNATION_SUSPEND: @@ -623,7 +624,8 @@ static void power_down(void) * corruption after resume. */ printk(KERN_CRIT "PM: Please power down manually\n"); - while(1); + while (1) + cpu_relax(); } /**
Reboot logic in kernel/reboot will avoid calling kernel_power_off when pm_power_off is null, and instead uses kernel_halt. Change hibernate's power_down to follow the behavior in the reboot call. Calling the notifier twice (once for SYS_POWER_OFF and again for SYS_HALT) causes a panic during hibernation on Kirkwood Openblocks A6 board. Signed-off-by: Sebastian Capella <sebastian.capella@linaro.org> Reported-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Cc: Len Brown <len.brown@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Russell King <linux@arm.linux.org.uk> Cc: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> --- kernel/power/hibernate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)