[src/netbsd-6]: src/sys/arch/powerpc Pull up following revision(s) (requested...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74a29387e04e
branches:  netbsd-6
changeset: 777060:74a29387e04e
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 18 08:44:41 2016 +0000

description:
Pull up following revision(s) (requested by matt in ticket #1310):
        sys/arch/powerpc/include/userret.h: revision 1.29-1.30
        sys/arch/powerpc/include/psl.h: revision 1.20
        sys/arch/powerpc/oea/oea_machdep.c: revision 1.72
(via patch)

Add a check to make sure that if PSL_FP is set, we own the FPU.
Don't clear PSL_FP/PSL_VEC
Remove PSL_SPV from BOOKE PSL_USERMOD
Don't preserve PSL_FP/PSL_VEC in cpu_setmcontext.

diffstat:

 sys/arch/powerpc/include/psl.h     |   4 ++--
 sys/arch/powerpc/include/userret.h |  10 ++++++++--
 sys/arch/powerpc/oea/oea_machdep.c |  11 ++++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diffs (82 lines):

diff -r 0f04a7d2bca2 -r 74a29387e04e sys/arch/powerpc/include/psl.h
--- a/sys/arch/powerpc/include/psl.h    Tue May 10 23:17:59 2016 +0000
+++ b/sys/arch/powerpc/include/psl.h    Wed May 18 08:44:41 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psl.h,v 1.18.8.3 2015/11/19 08:50:05 bouyer Exp $      */
+/*     $NetBSD: psl.h,v 1.18.8.4 2016/05/18 08:44:41 martin Exp $      */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -111,7 +111,7 @@
 #elif defined(PPC_BOOKE)
 #define        PSL_USERSET             (PSL_EE | PSL_PR | PSL_IS | PSL_DS | PSL_ME | PSL_CE | PSL_DE)
 #define        PSL_USERMASK            (PSL_SPV | PSL_CE | 0xFFFF)
-#define        PSL_USERMOD             (PSL_SPV)
+#define        PSL_USERMOD             (0)
 #else /* PPC_IBM4XX */
 #ifdef PPC_IBM403
 #define        PSL_USERSET             (PSL_EE | PSL_PR | PSL_IR | PSL_DR | PSL_ME)
diff -r 0f04a7d2bca2 -r 74a29387e04e sys/arch/powerpc/include/userret.h
--- a/sys/arch/powerpc/include/userret.h        Tue May 10 23:17:59 2016 +0000
+++ b/sys/arch/powerpc/include/userret.h        Wed May 18 08:44:41 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: userret.h,v 1.22.8.4 2015/11/19 08:50:05 bouyer Exp $  */
+/*     $NetBSD: userret.h,v 1.22.8.5 2016/05/18 08:44:41 martin Exp $  */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -58,7 +58,13 @@
        /* Invoke MI userret code */
        mi_userret(l);
 
-       tf->tf_srr1 &= PSL_USERSRR1;    /* clear SRR1 status bits */
+       KASSERTMSG((tf->tf_srr1 & PSL_FP) == 0
+           || l->l_cpu->ci_data.cpu_pcu_curlwp[PCU_FPU] == l,
+           "tf=%p: srr1 (%#lx): PSL_FP set but FPU curlwp %p is not curlwp %p!",
+           tf, tf->tf_srr1, l->l_cpu->ci_data.cpu_pcu_curlwp[PCU_FPU], l);
+
+       /* clear SRR1 status bits */
+       tf->tf_srr1 &= (PSL_USERSRR1|PSL_FP|PSL_VEC);
 
 #ifdef ALTIVEC
        /*
diff -r 0f04a7d2bca2 -r 74a29387e04e sys/arch/powerpc/oea/oea_machdep.c
--- a/sys/arch/powerpc/oea/oea_machdep.c        Tue May 10 23:17:59 2016 +0000
+++ b/sys/arch/powerpc/oea/oea_machdep.c        Wed May 18 08:44:41 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: oea_machdep.c,v 1.63.2.3 2015/11/19 08:50:05 bouyer Exp $      */
+/*     $NetBSD: oea_machdep.c,v 1.63.2.4 2016/05/18 08:44:42 martin Exp $      */
 
 /*
  * Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.63.2.3 2015/11/19 08:50:05 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.63.2.4 2016/05/18 08:44:42 martin Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_compat_netbsd.h"
@@ -391,19 +391,16 @@
 
         /*
         * Configure a PSL user mask matching this processor.
+        * Don't allow to set PSL_FP/PSL_VEC, since that will affect PCU.
         */
        cpu_psluserset = PSL_EE | PSL_PR | PSL_ME | PSL_IR | PSL_DR | PSL_RI;
-       cpu_pslusermod = PSL_FP | PSL_FE0 | PSL_FE1 | PSL_LE | PSL_SE | PSL_BE;
+       cpu_pslusermod = PSL_FE0 | PSL_FE1 | PSL_LE | PSL_SE | PSL_BE;
 #ifdef PPC_OEA601
        if (cpuvers == MPC601) {
                cpu_psluserset &= PSL_601_MASK;
                cpu_pslusermod &= PSL_601_MASK;
        }
 #endif
-#ifdef ALTIVEC
-       if (cpu_altivec)
-               cpu_pslusermod |= PSL_VEC;
-#endif
 #ifdef PPC_HIGH_VEC
        cpu_psluserset |= PSL_IP;       /* XXX ok? */
 #endif