PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure
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> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
ffa64eff95
commit
8c506608c3
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue