diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-02-16 04:41:41 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-20 04:13:12 -0500 |
commit | 3d6395cb770b0db9135a853b1742418c99ed2148 (patch) | |
tree | 609b1d8f6d3ff13a312c8eb0ce4f070b644b6e05 /arch/sparc64/kernel/etrap.S | |
parent | 135066a21129760e44a51a7ef31d8c861f8ddace (diff) |
[SPARC64]: Fix tl1 trap state capture/dump on SUN4V.
No trap levels above 2 in privileged mode on SUN4V.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/etrap.S')
-rw-r--r-- | arch/sparc64/kernel/etrap.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S index a0e7d480e5dc..149383835c25 100644 --- a/arch/sparc64/kernel/etrap.S +++ b/arch/sparc64/kernel/etrap.S | |||
@@ -188,6 +188,11 @@ etraptl1: /* Save tstate/tpc/tnpc of TL 1-->4 and the tl register itself. | |||
188 | rdpr %tt, %g3 | 188 | rdpr %tt, %g3 |
189 | stx %g3, [%g2 + STACK_BIAS + 0x38] | 189 | stx %g3, [%g2 + STACK_BIAS + 0x38] |
190 | 190 | ||
191 | sethi %hi(is_sun4v), %g3 | ||
192 | lduw [%g3 + %lo(is_sun4v)], %g3 | ||
193 | brnz,pn %g3, finish_tl1_capture | ||
194 | nop | ||
195 | |||
191 | wrpr %g0, 3, %tl | 196 | wrpr %g0, 3, %tl |
192 | rdpr %tstate, %g3 | 197 | rdpr %tstate, %g3 |
193 | stx %g3, [%g2 + STACK_BIAS + 0x40] | 198 | stx %g3, [%g2 + STACK_BIAS + 0x40] |
@@ -210,6 +215,7 @@ etraptl1: /* Save tstate/tpc/tnpc of TL 1-->4 and the tl register itself. | |||
210 | 215 | ||
211 | stx %g1, [%g2 + STACK_BIAS + 0x80] | 216 | stx %g1, [%g2 + STACK_BIAS + 0x80] |
212 | 217 | ||
218 | finish_tl1_capture: | ||
213 | wrpr %g0, 1, %tl | 219 | wrpr %g0, 1, %tl |
214 | 661: nop | 220 | 661: nop |
215 | .section .sun4v_1insn_patch, "ax" | 221 | .section .sun4v_1insn_patch, "ax" |