| Message ID | 1435154526-9023-1-git-send-email-vkuznets@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
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: >
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:
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(-)