Merge commit 'v3.0.58' into android-3.0

[firefly-linux-kernel-4.4.55.git] / arch / arm / vfp / vfpmodule.c

diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index f25e7ec8941696f3bd10b765d387b6ea7936d4c0..192e9dd4c39b139365777efb88a1d86497bcb93d 100644 (file)
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -33,7 +33,13 @@ void vfp_support_entry(void);
 void vfp_null_entry(void);
 
 void (*vfp_vector)(void) = vfp_null_entry;
-union vfp_state *last_VFP_context[NR_CPUS];
+
+/*
+ * The pointer to the vfpstate structure of the thread which currently
+ * owns the context held in the VFP hardware, or NULL if the hardware
+ * context is invalid.
+ */
+union vfp_state *vfp_current_hw_state[NR_CPUS];
 
 /*
  * Dual-use variable.
@@ -57,12 +63,12 @@ static void vfp_thread_flush(struct thread_info *thread)
 
        /*
         * Disable VFP to ensure we initialize it first.  We must ensure
-        * that the modification of last_VFP_context[] and hardware disable
+        * that the modification of vfp_current_hw_state[] and hardware disable
         * are done for the same CPU and without preemption.
         */
        cpu = get_cpu();
-       if (last_VFP_context[cpu] == vfp)
-               last_VFP_context[cpu] = NULL;
+       if (vfp_current_hw_state[cpu] == vfp)
+               vfp_current_hw_state[cpu] = NULL;
        fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
        put_cpu();
 }
@@ -73,8 +79,8 @@ static void vfp_thread_exit(struct thread_info *thread)
        union vfp_state *vfp = &thread->vfpstate;
        unsigned int cpu = get_cpu();
 
-       if (last_VFP_context[cpu] == vfp)
-               last_VFP_context[cpu] = NULL;
+       if (vfp_current_hw_state[cpu] == vfp)
+               vfp_current_hw_state[cpu] = NULL;
        put_cpu();
 }
 
@@ -129,9 +135,9 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v)
                 * case the thread migrates to a different CPU. The
                 * restoring is done lazily.
                 */
-               if ((fpexc & FPEXC_EN) && last_VFP_context[cpu]) {
-                       vfp_save_state(last_VFP_context[cpu], fpexc);
-                       last_VFP_context[cpu]->hard.cpu = cpu;
+               if ((fpexc & FPEXC_EN) && vfp_current_hw_state[cpu]) {
+                       vfp_save_state(vfp_current_hw_state[cpu], fpexc);
+                       vfp_current_hw_state[cpu]->hard.cpu = cpu;
                }
                /*
                 * Thread migration, just force the reloading of the
@@ -139,7 +145,7 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v)
                 * contain stale data.
                 */
                if (thread->vfpstate.hard.cpu != cpu)
-                       last_VFP_context[cpu] = NULL;
+                       vfp_current_hw_state[cpu] = NULL;
 #endif
 
                /*
@@ -412,10 +418,16 @@ static int vfp_pm_suspend(void)
 
                /* disable, just in case */
                fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
+       } else if (vfp_current_hw_state[ti->cpu]) {
+#ifndef CONFIG_SMP
+               fmxr(FPEXC, fpexc | FPEXC_EN);
+               vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc);
+               fmxr(FPEXC, fpexc);
+#endif
        }
 
        /* clear any information we had about last context state */
-       memset(last_VFP_context, 0, sizeof(last_VFP_context));
+       vfp_current_hw_state[ti->cpu] = NULL;
 
        return 0;
 }
@@ -451,7 +463,7 @@ void vfp_sync_hwstate(struct thread_info *thread)
         * If the thread we're interested in is the current owner of the
         * hardware VFP state, then we need to save its state.
         */
-       if (last_VFP_context[cpu] == &thread->vfpstate) {
+       if (vfp_current_hw_state[cpu] == &thread->vfpstate) {
                u32 fpexc = fmrx(FPEXC);
 
                /*
@@ -473,7 +485,7 @@ void vfp_flush_hwstate(struct thread_info *thread)
         * If the thread we're interested in is the current owner of the
         * hardware VFP state, then we need to save its state.
         */
-       if (last_VFP_context[cpu] == &thread->vfpstate) {
+       if (vfp_current_hw_state[cpu] == &thread->vfpstate) {
                u32 fpexc = fmrx(FPEXC);
 
                fmxr(FPEXC, fpexc & ~FPEXC_EN);
@@ -482,7 +494,7 @@ void vfp_flush_hwstate(struct thread_info *thread)
                 * Set the context to NULL to force a reload the next time
                 * the thread uses the VFP.
                 */
-               last_VFP_context[cpu] = NULL;
+               vfp_current_hw_state[cpu] = NULL;
        }
 
 #ifdef CONFIG_SMP
@@ -514,7 +526,7 @@ static int vfp_hotplug(struct notifier_block *b, unsigned long action,
 {
        if (action == CPU_DYING || action == CPU_DYING_FROZEN) {
                unsigned int cpu = (long)hcpu;
-               last_VFP_context[cpu] = NULL;
+               vfp_current_hw_state[cpu] = NULL;
        } else if (action == CPU_STARTING || action == CPU_STARTING_FROZEN)
                vfp_enable(NULL);
        return NOTIFY_OK;
@@ -575,11 +587,14 @@ static int __init vfp_init(void)
                        elf_hwcap |= HWCAP_VFPv3;
 
                        /*
-                        * Check for VFPv3 D16. CPUs in this configuration
-                        * only have 16 x 64bit registers.
+                        * Check for VFPv3 D16 and VFPv4 D16.  CPUs in
+                        * this configuration only have 16 x 64bit
+                        * registers.
                         */
                        if (((fmrx(MVFR0) & MVFR0_A_SIMD_MASK)) == 1)
-                               elf_hwcap |= HWCAP_VFPv3D16;
+                               elf_hwcap |= HWCAP_VFPv3D16; /* also v4-D16 */
+                       else
+                               elf_hwcap |= HWCAP_VFPD32;
                }
 #endif
 #ifdef CONFIG_NEON