diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-10-25 20:16:00 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-10-25 20:16:00 +0000 |
| commit | 585f83b55765205ff9435ce3f37aa1197f92e2dd (patch) | |
| tree | 02d54f89575a21e385610b8f2646d9346c2b7c69 /sys | |
| parent | 6c6d66d7f57bae187ac82db6cde24c3ccc3e796c (diff) | |
Make sure we actually flush the I-TLB on UltraSPARC-III by doing it from
the primary context instead of the secondary context.
ok miod@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc64/sparc64/locore.s | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s index d7d136d691e..ba219716875 100644 --- a/sys/arch/sparc64/sparc64/locore.s +++ b/sys/arch/sparc64/sparc64/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.61 2006/08/27 21:19:02 kettenis Exp $ */ +/* $OpenBSD: locore.s,v 1.62 2006/10/25 20:15:59 kettenis Exp $ */ /* $NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $ */ /* @@ -4759,6 +4759,24 @@ _C_LABEL(tlb_flush_ctx): .text 2: #endif /* DIAGNOSTIC */ +#ifdef HORRID_III_HACK + rdpr %pstate, %o5 + andn %o5, PSTATE_IE, %o4 + wrpr %o4, %pstate ! disable interrupts + + rdpr %tl, %o3 + brnz %o3, 1f + add %o3, 1, %g2 + wrpr %g0, %g2, %tl ! Switch to traplevel > 0 +1: + mov CTX_PRIMARY, %o2 + sethi %hi(KERNBASE), %o4 + ldxa [%o2] ASI_DMMU, %g1 ! Save primary context + membar #LoadStore + stxa %o0, [%o2] ASI_DMMU ! Insert context to demap + membar #Sync + set DEMAP_CTX_PRIMARY, %g2 ! Demap context from primary context only +#else mov CTX_SECONDARY, %o2 sethi %hi(KERNBASE), %o4 ldxa [%o2] ASI_DMMU, %g1 ! Save secondary context @@ -4766,6 +4784,7 @@ _C_LABEL(tlb_flush_ctx): stxa %o0, [%o2] ASI_DMMU ! Insert context to demap membar #Sync set DEMAP_CTX_SECONDARY, %g2 ! Demap context from secondary context only +#endif stxa %g2, [%g2] ASI_DMMU_DEMAP ! Do the demap membar #Sync ! No real reason for this XXXX stxa %g2, [%g2] ASI_IMMU_DEMAP ! Do the demap @@ -4773,6 +4792,10 @@ _C_LABEL(tlb_flush_ctx): stxa %g1, [%o2] ASI_DMMU ! Restore secondary asi membar #Sync ! No real reason for this XXXX flush %o4 +#ifdef HORRID_III_HACK + wrpr %g0, %o3, %tl ! Restore traplevel + wrpr %o5, %pstate ! Restore interrupts +#endif retl nop |