Module Name: src
Committed By: palle
Date: Tue Aug 23 19:57:01 UTC 2016
Modified Files:
src/sys/arch/sparc64/sparc64: locore.s
Log Message:
sun4v: rework sun4v_datatrap so it works properly when running on a T2-based
system like T5120 - for some reason %tl is 0 when entering sun4v_datatrap
causing a crash (sir instruction), so ignore the %tl value for now upon entry
to sun4v_datatrap - with this fix both T1 and T2 based systems reach the same
point - hangs in rft_user after the init process is started
To generate a diff of this commit:
cvs rdiff -u -r1.399 -r1.400 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.399 src/sys/arch/sparc64/sparc64/locore.s:1.400
--- src/sys/arch/sparc64/sparc64/locore.s:1.399 Mon Jul 18 19:51:06 2016
+++ src/sys/arch/sparc64/sparc64/locore.s Tue Aug 23 19:57:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.399 2016/07/18 19:51:06 palle Exp $ */
+/* $NetBSD: locore.s,v 1.400 2016/08/23 19:57:01 palle Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -2851,15 +2851,7 @@ sun4v_dtsb_miss:
retry
NOTREACHED
-sun4v_datatrap: ! branch further based on trap level
- rdpr %tl, %g1
- dec %g1
- beq sun4v_datatrap_tl0
- nop
- ba sun4v_datatrap_tl1
- nop
-
-sun4v_datatrap_tl0:
+sun4v_datatrap:
GET_MMFSA %g3 ! MMU Fault status area
add %g3, 0x48, %g1
LDPTRA [%g1] ASI_PHYS_CACHED, %g1 ! Data fault address
@@ -2918,10 +2910,6 @@ sun4v_datatrap_tl0:
nop
NOTREACHED
-sun4v_datatrap_tl1:
- /* XXX missing implementaion */
- sir
-
sun4v_tl0_dtsb_prot:
GET_MMFSA %g1 ! MMU Fault status area
add %g1, 0x48, %g3
