Module Name: src
Committed By: palle
Date: Thu Jan 5 20:37:06 UTC 2017
Modified Files:
src/sys/arch/sparc64/sparc64: locore.s
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.403 -r1.404 src/sys/arch/sparc64/sparc64/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.403 src/sys/arch/sparc64/sparc64/locore.s:1.404
--- src/sys/arch/sparc64/sparc64/locore.s:1.403 Wed Jan 4 20:19:29 2017
+++ src/sys/arch/sparc64/sparc64/locore.s Thu Jan 5 20:37:06 2017
@@ -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 @@ intr_setup_msg:
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 @@ intr_setup_msg:
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:
