diff options
| author | Colin Cross <ccross@android.com> | 2011-08-16 16:36:29 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-09-11 17:27:03 -0700 |
| commit | 36af2a472ac1b8785f679749c43e47fd37aba2b1 (patch) | |
| tree | e6744364b17d52ce757cb3976640c72e8234db3e /arch | |
| parent | 4f77fd436e53acf5bc0a06a24331f64b07fb33ec (diff) | |
| download | kernel_samsung_aries-36af2a472ac1b8785f679749c43e47fd37aba2b1.zip kernel_samsung_aries-36af2a472ac1b8785f679749c43e47fd37aba2b1.tar.gz kernel_samsung_aries-36af2a472ac1b8785f679749c43e47fd37aba2b1.tar.bz2 | |
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 <linux@arm.linux.org.uk>
Cc: Barry Song <bs14@csr.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 0a96f71..50dbe35 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 */ |