* [PATCH] PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure
@ 2015-06-24 14:02 Vitaly Kuznetsov
2015-06-24 22:15 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Vitaly Kuznetsov @ 2015-06-24 14:02 UTC (permalink / raw)
To: linux-pm; +Cc: linux-kernel, Rafael J. Wysocki, Pavel Machek, Len Brown
When disable_nonboot_cpus() fails on some cpu it doesn't bring back all
cpus it managed to offline, a consequent call to enable_nonboot_cpus() is
expected. In hibernation_platform_enter() we don't call
enable_nonboot_cpus() on error so cpus stay offlined.
create_image() and resume_target_kernel() functions handle
disable_nonboot_cpus() faults correctly, hibernation_platform_enter()
is the only one which is doing it wrong.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
kernel/power/hibernate.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 2329daa..690f78f 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -552,7 +552,7 @@ int hibernation_platform_enter(void)
error = disable_nonboot_cpus();
if (error)
- goto Platform_finish;
+ goto Enable_cpus;
local_irq_disable();
syscore_suspend();
@@ -568,6 +568,8 @@ int hibernation_platform_enter(void)
Power_up:
syscore_resume();
local_irq_enable();
+
+ Enable_cpus:
enable_nonboot_cpus();
Platform_finish:
--
2.4.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure
2015-06-24 14:02 [PATCH] PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure Vitaly Kuznetsov
@ 2015-06-24 22:15 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2015-06-24 22:15 UTC (permalink / raw)
To: Vitaly Kuznetsov; +Cc: linux-pm, linux-kernel, Pavel Machek, Len Brown
On Wednesday, June 24, 2015 04:02:06 PM Vitaly Kuznetsov wrote:
> When disable_nonboot_cpus() fails on some cpu it doesn't bring back all
> cpus it managed to offline, a consequent call to enable_nonboot_cpus() is
> expected. In hibernation_platform_enter() we don't call
> enable_nonboot_cpus() on error so cpus stay offlined.
>
> create_image() and resume_target_kernel() functions handle
> disable_nonboot_cpus() faults correctly, hibernation_platform_enter()
> is the only one which is doing it wrong.
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Applied, thanks!
> ---
> kernel/power/hibernate.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index 2329daa..690f78f 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -552,7 +552,7 @@ int hibernation_platform_enter(void)
>
> error = disable_nonboot_cpus();
> if (error)
> - goto Platform_finish;
> + goto Enable_cpus;
>
> local_irq_disable();
> syscore_suspend();
> @@ -568,6 +568,8 @@ int hibernation_platform_enter(void)
> Power_up:
> syscore_resume();
> local_irq_enable();
> +
> + Enable_cpus:
> enable_nonboot_cpus();
>
> Platform_finish:
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-24 21:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-24 14:02 [PATCH] PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure Vitaly Kuznetsov
2015-06-24 22:15 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox