kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure

Browse source 
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:
Vitaly Kuznetsov 2015-06-24 16:02:06 +02:00 committed by Rafael J. Wysocki
parent ffa64eff95
commit 8c506608c3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/power/hibernate.c
View file

@ -552,7 +552,7 @@ int hibernation_platform_enter(void)
error = disable_nonboot_cpus(); error = disable_nonboot_cpus();
if (error) if (error)
goto Platform_finish; goto Enable_cpus;
local_irq_disable(); local_irq_disable();
syscore_suspend(); syscore_suspend();
@ -568,6 +568,8 @@ int hibernation_platform_enter(void)
Power_up: Power_up:
syscore_resume(); syscore_resume();
local_irq_enable(); local_irq_enable();
Enable_cpus:
enable_nonboot_cpus(); enable_nonboot_cpus();
Platform_finish: Platform_finish: