Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put NOPs to avoid load delay hazard on R3000.

Browse Source 
Fixes TLB miss panic in ras_mutex_spin_exit() on NWS-3470D.
This commit is contained in:
tsutsui 2011-03-08 15:01:02 +00:00
parent fe92fa8193
commit 908b1c665b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/mips/mips/lock_stubs_ras.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: lock_stubs_ras.S,v 1.1 2011/02/20 07:45:47 matt Exp $ */
/* $NetBSD: lock_stubs_ras.S,v 1.2 2011/03/08 15:01:02 tsutsui Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@ -377,6 +377,7 @@ END(ras_mutex_spin_enter)
*/
LEAF(ras_mutex_spin_exit)
PTR_L t2, L_CPU(MIPS_CURLWP)
nop
#if defined(DIAGNOSTIC)
INT_L t0, MTX_LOCK(a0)
nop
@ -392,7 +393,6 @@ LEAF(ras_mutex_spin_exit)
*/
#ifdef PARANOIA
INT_L a2, MTX_IPL(a0)
nop
#endif
INT_L a0, CPU_INFO_MTX_OLDSPL(t2)
@ -408,6 +408,7 @@ LEAF(ras_mutex_spin_exit)
* If the IPL doesn't change, nothing to do
*/
INT_L a1, CPU_INFO_CPL(t2)
nop
#ifdef PARANOIA
sltu v0, a1, a2 # v0 = cpl < mtx_ipl