summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/ttable.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-sparc64/ttable.h')
-rw-r--r--include/asm-sparc64/ttable.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
index 972f913709a..6bb86a7a5b4 100644
--- a/include/asm-sparc64/ttable.h
+++ b/include/asm-sparc64/ttable.h
@@ -180,25 +180,25 @@
#define KPROBES_TRAP(lvl) TRAP_ARG(bad_trap, lvl)
#endif
-#define SUN4V_ITSB_MISS \
- mov SCRATCHPAD_CPUID, %g1; \
- ldxa [%g1] ASI_SCRATCHPAD, %g2; \
- ldxa [%g1 + %g1] ASI_SCRATCHPAD, %g1;\
- sethi %hi(trap_block), %g5; \
- sllx %g2, TRAP_BLOCK_SZ_SHIFT, %g2; \
- or %g5, %lo(trap_block), %g5; \
- ba,pt %xcc, sun4v_itsb_miss; \
- add %g5, %g2, %g5;
+#define SUN4V_ITSB_MISS \
+ ldxa [%g0] ASI_SCRATCHPAD, %g2; \
+ ldx [%g2 + HV_FAULT_I_ADDR_OFFSET], %g4; \
+ ldx [%g2 + HV_FAULT_I_CTX_OFFSET], %g5; \
+ srlx %g4, 22, %g7; \
+ sllx %g5, 48, %g6; \
+ brz,pn %g5, kvmap_itlb_4v; \
+ or %g6, %g7, %g6; \
+ ba,a,pt %xcc, sun4v_itsb_miss;
#define SUN4V_DTSB_MISS \
- mov SCRATCHPAD_CPUID, %g1; \
- ldxa [%g1] ASI_SCRATCHPAD, %g2; \
- ldxa [%g1 + %g1] ASI_SCRATCHPAD, %g1;\
- sethi %hi(trap_block), %g5; \
- sllx %g2, TRAP_BLOCK_SZ_SHIFT, %g2; \
- or %g5, %lo(trap_block), %g5; \
- ba,pt %xcc, sun4v_dtsb_miss; \
- add %g5, %g2, %g5;
+ ldxa [%g0] ASI_SCRATCHPAD, %g2; \
+ ldx [%g2 + HV_FAULT_D_ADDR_OFFSET], %g4; \
+ ldx [%g2 + HV_FAULT_D_CTX_OFFSET], %g5; \
+ srlx %g4, 22, %g7; \
+ sllx %g5, 48, %g6; \
+ brz,pn %g5, kvmap_dtlb_4v; \
+ or %g6, %g7, %g6; \
+ ba,a,pt %xcc, sun4v_dtsb_miss;
/* Before touching these macros, you owe it to yourself to go and
* see how arch/sparc64/kernel/winfixup.S works... -DaveM