4 files changed, 106 insertions, 18 deletions

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 8655c767035..92768d3006f 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -78,6 +78,10 @@ int main(void)
         DEFINE(THREAD_VSCR, offsetof(struct thread_struct, vscr));
         DEFINE(THREAD_USED_VR, offsetof(struct thread_struct, used_vr));
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_VSX
+        DEFINE(THREAD_VSR0, offsetof(struct thread_struct, fpr));
+        DEFINE(THREAD_USED_VSR, offsetof(struct thread_struct, used_vsr));
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_PPC64
         DEFINE(KSP_VSID, offsetof(struct thread_struct, ksp_vsid));
 #else /* CONFIG_PPC64 */
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 59ff08704e9..70fbde84b83 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -215,29 +215,56 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset,
                    unsigned int pos, unsigned int count,
                    void *kbuf, void __user *ubuf)
 {
+#ifdef CONFIG_VSX
+        double buf[33];
+        int i;
+#endif
         flush_fp_to_thread(target);
 
+#ifdef CONFIG_VSX
+        /* copy to local buffer then write that out */
+        for (i = 0; i < 32 ; i++)
+                buf[i] = target->thread.TS_FPR(i);
+        memcpy(&buf[32], &target->thread.fpscr, sizeof(double));
+        return user_regset_copyout(&pos, &count, &kbuf, &ubuf, buf, 0, -1);
+
+#else
         BUILD_BUG_ON(offsetof(struct thread_struct, fpscr) !=
                      offsetof(struct thread_struct, TS_FPR(32)));
 
         return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
                                    &target->thread.fpr, 0, -1);
+#endif
 }
 
 static int fpr_set(struct task_struct *target, const struct user_regset *regset,
                    unsigned int pos, unsigned int count,
                    const void *kbuf, const void __user *ubuf)
 {
+#ifdef CONFIG_VSX
+        double buf[33];
+        int i;
+#endif
         flush_fp_to_thread(target);
 
+#ifdef CONFIG_VSX
+        /* copy to local buffer then write that out */
+        i = user_regset_copyin(&pos, &count, &kbuf, &ubuf, buf, 0, -1);
+        if (i)
+                return i;
+        for (i = 0; i < 32 ; i++)
+                target->thread.TS_FPR(i) = buf[i];
+        memcpy(&target->thread.fpscr, &buf[32], sizeof(double));
+        return 0;
+#else
         BUILD_BUG_ON(offsetof(struct thread_struct, fpscr) !=
                      offsetof(struct thread_struct, TS_FPR(32)));
 
         return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
                                   &target->thread.fpr, 0, -1);
+#endif
 }
 
-
 #ifdef CONFIG_ALTIVEC
 /*
  * Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index b057e6852a7..f7fa395b9fb 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -337,14 +337,16 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
                 int sigret)
 {
         unsigned long msr = regs->msr;
+#ifdef CONFIG_VSX
+        double buf[32];
+        int i;
+#endif
 
         /* Make sure floating point registers are stored in regs */
         flush_fp_to_thread(current);
 
-        /* save general and floating-point registers */
-        if (save_general_regs(regs, frame) ||
-            __copy_to_user(&frame->mc_fregs, current->thread.fpr,
-                    ELF_NFPREG * sizeof(double)))
+        /* save general registers */
+        if (save_general_regs(regs, frame))
                 return 1;
 
 #ifdef CONFIG_ALTIVEC
@@ -368,7 +370,20 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
         if (__put_user(current->thread.vrsave, (u32 __user *)&frame->mc_vregs[32]))
                 return 1;
 #endif /* CONFIG_ALTIVEC */
-
+#ifdef CONFIG_VSX
+        /* save FPR copy to local buffer then write to the thread_struct */
+        flush_fp_to_thread(current);
+        for (i = 0; i < 32 ; i++)
+                buf[i] = current->thread.TS_FPR(i);
+        memcpy(&buf[i], &current->thread.fpscr, sizeof(double));
+        if (__copy_to_user(&frame->mc_fregs, buf, ELF_NFPREG * sizeof(double)))
+                return 1;
+#else
+        /* save floating-point registers */
+        if (__copy_to_user(&frame->mc_fregs, current->thread.fpr,
+                    ELF_NFPREG * sizeof(double)))
+                return 1;
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_SPE
         /* save spe registers */
         if (current->thread.used_spe) {
@@ -411,6 +426,10 @@ static long restore_user_regs(struct pt_regs *regs,
         long err;
         unsigned int save_r2 = 0;
         unsigned long msr;
+#ifdef CONFIG_VSX
+        double buf[32];
+        int i;
+#endif
 
         /*
          * restore general registers but not including MSR or SOFTE. Also
@@ -438,16 +457,11 @@ static long restore_user_regs(struct pt_regs *regs,
          */
         discard_lazy_cpu_state();
 
-        /* force the process to reload the FP registers from
-           current->thread when it next does FP instructions */
-        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1);
-        if (__copy_from_user(current->thread.fpr, &sr->mc_fregs,
-                             sizeof(sr->mc_fregs)))
-                return 1;
-
 #ifdef CONFIG_ALTIVEC
-        /* force the process to reload the altivec registers from
-           current->thread when it next does altivec instructions */
+        /*
+         * Force the process to reload the altivec registers from
+         * current->thread when it next does altivec instructions
+         */
         regs->msr &= ~MSR_VEC;
         if (msr & MSR_VEC) {
                 /* restore altivec registers from the stack */
@@ -462,6 +476,23 @@ static long restore_user_regs(struct pt_regs *regs,
                 return 1;
 #endif /* CONFIG_ALTIVEC */
 
+#ifdef CONFIG_VSX
+        if (__copy_from_user(buf, &sr->mc_fregs,sizeof(sr->mc_fregs)))
+                return 1;
+        for (i = 0; i < 32 ; i++)
+                current->thread.TS_FPR(i) = buf[i];
+        memcpy(&current->thread.fpscr, &buf[i], sizeof(double));
+#else
+        if (__copy_from_user(current->thread.fpr, &sr->mc_fregs,
+                             sizeof(sr->mc_fregs)))
+                return 1;
+#endif /* CONFIG_VSX */
+        /*
+         * force the process to reload the FP registers from
+         * current->thread when it next does FP instructions
+         */
+        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1);
+
 #ifdef CONFIG_SPE
         /* force the process to reload the spe registers from
            current->thread when it next does spe instructions */
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index da7c058e373..a587b33cd6b 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -89,6 +89,10 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
 #endif
         unsigned long msr = regs->msr;
         long err = 0;
+#ifdef CONFIG_VSX
+        double buf[FP_REGS_SIZE];
+        int i;
+#endif
 
         flush_fp_to_thread(current);
 
@@ -112,11 +116,21 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
 #else /* CONFIG_ALTIVEC */
         err |= __put_user(0, &sc->v_regs);
 #endif /* CONFIG_ALTIVEC */
+        flush_fp_to_thread(current);
+#ifdef CONFIG_VSX
+        /* Copy FP to local buffer then write that out */
+        for (i = 0; i < 32 ; i++)
+                buf[i] = current->thread.TS_FPR(i);
+        memcpy(&buf[i], &current->thread.fpscr, sizeof(double));
+        err |= __copy_to_user(&sc->fp_regs, buf, FP_REGS_SIZE);
+#else /* CONFIG_VSX */
+        /* copy fpr regs and fpscr */
+        err |= __copy_to_user(&sc->fp_regs, &current->thread.fpr, FP_REGS_SIZE);
+#endif /* CONFIG_VSX */
         err |= __put_user(&sc->gp_regs, &sc->regs);
         WARN_ON(!FULL_REGS(regs));
         err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE);
         err |= __put_user(msr, &sc->gp_regs[PT_MSR]);
-        err |= __copy_to_user(&sc->fp_regs, &current->thread.fpr, FP_REGS_SIZE);
         err |= __put_user(signr, &sc->signal);
         err |= __put_user(handler, &sc->handler);
         if (set != NULL)
@@ -135,6 +149,9 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
 #ifdef CONFIG_ALTIVEC
         elf_vrreg_t __user *v_regs;
 #endif
+#ifdef CONFIG_VSX
+        double buf[FP_REGS_SIZE];
+#endif
         unsigned long err = 0;
         unsigned long save_r13 = 0;
         elf_greg_t *gregs = (elf_greg_t *)regs;
@@ -182,8 +199,6 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
          */
         regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
 
-        err |= __copy_from_user(&current->thread.fpr, &sc->fp_regs, FP_REGS_SIZE);
-
 #ifdef CONFIG_ALTIVEC
         err |= __get_user(v_regs, &sc->v_regs);
         if (err)
@@ -202,7 +217,18 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
         else
                 current->thread.vrsave = 0;
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_VSX
+        /* restore floating point */
+        err |= __copy_from_user(buf, &sc->fp_regs, FP_REGS_SIZE);
+        if (err)
+                return err;
+        for (i = 0; i < 32 ; i++)
+                current->thread.TS_FPR(i) = buf[i];
+        memcpy(&current->thread.fpscr, &buf[i], sizeof(double));
 
+#else
+        err |= __copy_from_user(&current->thread.fpr, &sc->fp_regs, FP_REGS_SIZE);
+#endif
         return err;
 }