[SPARC64]: Use ASI_SCRATCHPAD address 0x0 properly.
This is where the virtual address of the fault status
area belongs.
To set it up we don't make a hypervisor call, instead
we call OBP's SUNW,set-trap-table with the real address
of the fault status area as the second argument. And
right before that call we write the virtual address into
ASI_SCRATCHPAD vaddr 0x0.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
index 972f913..6bb86a7 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