From: Colin Cross Date: Tue, 16 Aug 2011 23:36:29 +0000 (-0700) Subject: ARM: vfp: Always save VFP state in vfp_pm_suspend X-Git-Tag: firefly_0821_release~7613^2~313 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=36af2a472ac1b8785f679749c43e47fd37aba2b1;p=firefly-linux-kernel-4.4.55.git ARM: vfp: Always save VFP state in vfp_pm_suspend vfp_pm_suspend should save the VFP state in suspend after any lazy context switch. If it only saves when the VFP is enabled, the state can get lost when, on a UP system: Thread 1 uses the VFP Context switch occurs to thread 2, VFP is disabled but the VFP context is not saved Thread 2 initiates suspend vfp_pm_suspend is called with the VFP disabled, and the unsaved VFP context of Thread 1 in the registers Modify vfp_pm_suspend to save the VFP context whenever vfp_current_hw_state is not NULL. Change-Id: I91f29722d256a3afc1cc04df8b227541434ccffb Cc: Russell King Cc: Barry Song Cc: Catalin Marinas Signed-off-by: Colin Cross --- diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 0a96f71f0abd..50dbe3545c04 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -451,6 +451,10 @@ static int vfp_pm_suspend(void) /* disable, just in case */ fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN); + } else if (vfp_current_hw_state[ti->cpu]) { + fmxr(FPEXC, fpexc | FPEXC_EN); + vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc); + fmxr(FPEXC, fpexc); } /* clear any information we had about last context state */