[src/trunk]: src/sys/arch/sparc64/sparc64 sun4v: TRAP_SETUP() updated to set ...

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

details:   https://anonhg.NetBSD.org/src/rev/16fe592222fb
branches:  trunk
changeset: 820279:16fe592222fb
user:      palle <palle%NetBSD.org@localhost>
date:      Thu Jan 05 20:37:06 2017 +0000

description:
sun4v: TRAP_SETUP() updated to set mmu context id properly for both sun4v and sun4u platforms. Verified using qemu for both sun4u and sun4v systems

diffstat:

 sys/arch/sparc64/sparc64/locore.s |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f2501062dee7 -r 16fe592222fb sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Thu Jan 05 20:31:37 2017 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Thu Jan 05 20:37:06 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.403 2017/01/04 20:19:29 palle Exp $       */
+/*     $NetBSD: locore.s,v 1.404 2017/01/05 20:37:06 palle Exp $       */
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -1461,7 +1461,7 @@
        wrpr    %g0, %g5, %otherwin; \
        wrpr    %g0, WSTATE_KERN, %wstate;                      /* Enable kernel mode window traps -- now we can trap again */ \
 \
-       stxa    %g0, [%g7] ASI_DMMU;                            /* Switch MMU to kernel primary context */ \
+       SET_MMU_CONTEXTID %g0, %g7,%g5;                         /* Switch MMU to kernel primary context */ \
        sethi   %hi(KERNBASE), %g5; \
        flush   %g5;                                            /* Some convenient address that won't trap */ \
 1:
@@ -1577,7 +1577,7 @@
        wrpr    %g0, %g5, %otherwin; \
        wrpr    %g0, WSTATE_KERN, %wstate;                      /* Enable kernel mode window traps -- now we can trap again */ \
        \
-       stxa    %g0, [%g7] ASI_DMMU;                            /* Switch MMU to kernel primary context */ \
+       SET_MMU_CONTEXTID %g0, %g7, %g5;                        /* Switch MMU to kernel primary context */ \
        sethi   %hi(KERNBASE), %g5; \
        flush   %g5;                                            /* Some convenient address that won't trap */ \
 1: