diff options
Diffstat (limited to 'arch/arm/vfp')
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 871f03c90b34..8383b7a1e90a 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -21,6 +21,7 @@ #include <asm/cputype.h> #include <asm/thread_notify.h> #include <asm/vfp.h> +#include <asm/cpu_pm.h> #include "vfpinstr.h" #include "vfp.h" @@ -175,6 +176,35 @@ static struct notifier_block vfp_notifier_block = { .notifier_call = vfp_notifier, }; +static int vfp_cpu_pm_notifier(struct notifier_block *self, unsigned long cmd, + void *v) +{ + u32 fpexc = fmrx(FPEXC); + unsigned int cpu = smp_processor_id(); + + switch (cmd) { + case CPU_PM_ENTER: + if (last_VFP_context[cpu]) { + fmxr(FPEXC, fpexc | FPEXC_EN); + vfp_save_state(last_VFP_context[cpu], fpexc); + /* force a reload when coming back from idle */ + last_VFP_context[cpu] = NULL; + fmxr(FPEXC, fpexc & ~FPEXC_EN); + } + break; + case CPU_PM_ENTER_FAILED: + case CPU_PM_EXIT: + /* make sure VFP is disabled when leaving idle */ + fmxr(FPEXC, fpexc & ~FPEXC_EN); + break; + } + return NOTIFY_OK; +} + +static struct notifier_block vfp_cpu_pm_notifier_block = { + .notifier_call = vfp_cpu_pm_notifier, +}; + /* * Raise a SIGFPE for the current process. * sicode describes the signal being raised. @@ -411,6 +441,12 @@ static int vfp_pm_suspend(void) struct thread_info *ti = current_thread_info(); u32 fpexc = fmrx(FPEXC); + /* If lazy disable, re-enable the VFP ready for it to be saved */ + if (last_VFP_context[ti->cpu] != &ti->vfpstate) { + fpexc |= FPEXC_EN; + fmxr(FPEXC, fpexc); + } + /* if vfp is on, then save state for resumption */ if (fpexc & FPEXC_EN) { printk(KERN_DEBUG "%s: saving vfp state\n", __func__); @@ -573,6 +609,7 @@ static int __init vfp_init(void) vfp_vector = vfp_support_entry; thread_register_notifier(&vfp_notifier_block); + cpu_pm_register_notifier(&vfp_cpu_pm_notifier_block); vfp_pm_init(); /* |