[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>
This commit is contained in:
@@ -156,13 +156,16 @@ extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
|
||||
nop; \
|
||||
.previous;
|
||||
|
||||
/* Clobbers TMP, current address space PGD phys address into DEST. */
|
||||
#define TRAP_LOAD_PGD_PHYS(DEST, TMP) \
|
||||
#define TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \
|
||||
__GET_CPUID(TMP) \
|
||||
sethi %hi(trap_block), DEST; \
|
||||
sllx TMP, TRAP_BLOCK_SZ_SHIFT, TMP; \
|
||||
or DEST, %lo(trap_block), DEST; \
|
||||
add DEST, TMP, DEST; \
|
||||
|
||||
/* Clobbers TMP, current address space PGD phys address into DEST. */
|
||||
#define TRAP_LOAD_PGD_PHYS(DEST, TMP) \
|
||||
TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \
|
||||
ldx [DEST + TRAP_PER_CPU_PGD_PADDR], DEST;
|
||||
|
||||
/* Clobbers TMP, loads local processor's IRQ work area into DEST. */
|
||||
@@ -175,11 +178,8 @@ extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
|
||||
|
||||
/* Clobbers TMP, loads DEST with current thread info pointer. */
|
||||
#define TRAP_LOAD_THREAD_REG(DEST, TMP) \
|
||||
__GET_CPUID(TMP) \
|
||||
sethi %hi(trap_block), DEST; \
|
||||
sllx TMP, TRAP_BLOCK_SZ_SHIFT, TMP; \
|
||||
or DEST, %lo(trap_block), DEST; \
|
||||
ldx [DEST + TMP], DEST;
|
||||
TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \
|
||||
ldx [DEST + TRAP_PER_CPU_THREAD], DEST;
|
||||
|
||||
/* Given the current thread info pointer in THR, load the per-cpu
|
||||
* area base of the current processor into DEST. REG1, REG2, and REG3 are
|
||||
@@ -201,13 +201,13 @@ extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
|
||||
|
||||
#else
|
||||
|
||||
#define __GET_CPUID(REG) \
|
||||
mov 0, REG;
|
||||
#define TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \
|
||||
sethi %hi(trap_block), DEST; \
|
||||
or DEST, %lo(trap_block), DEST; \
|
||||
|
||||
/* Uniprocessor versions, we know the cpuid is zero. */
|
||||
#define TRAP_LOAD_PGD_PHYS(DEST, TMP) \
|
||||
sethi %hi(trap_block), DEST; \
|
||||
or DEST, %lo(trap_block), DEST; \
|
||||
TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \
|
||||
ldx [DEST + TRAP_PER_CPU_PGD_PADDR], DEST;
|
||||
|
||||
#define TRAP_LOAD_IRQ_WORK(DEST, TMP) \
|
||||
@@ -215,8 +215,8 @@ extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,
|
||||
or DEST, %lo(__irq_work), DEST;
|
||||
|
||||
#define TRAP_LOAD_THREAD_REG(DEST, TMP) \
|
||||
sethi %hi(trap_block), DEST; \
|
||||
ldx [DEST + %lo(trap_block)], DEST;
|
||||
TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \
|
||||
ldx [DEST + TRAP_PER_CPU_THREAD], DEST;
|
||||
|
||||
/* No per-cpu areas on uniprocessor, so no need to load DEST. */
|
||||
#define LOAD_PER_CPU_BASE(DEST, THR, REG1, REG2, REG3)
|
||||
|
||||
@@ -338,6 +338,7 @@ int cpu_find_by_mid(int mid, int *prom_node);
|
||||
|
||||
/* Client interface level routines. */
|
||||
extern void prom_set_trap_table(unsigned long tba);
|
||||
extern void prom_set_trap_table_sun4v(unsigned long tba, unsigned long mmfsa);
|
||||
|
||||
extern long p1275_cmd(const char *, long, ...);
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user