PERFORCE change 97668 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=97668

Change 97668 by kmacy at kmacy_storage:sun4v_work on 2006/05/23 05:57:29

	membar #Sync after page invalidates
	just retry as we typically won't have mondos queued

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#9 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#9 (text+ko) ====

@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2002 Jake Burkholder.
+ * Copyright (c) 2006 Kip Macy kmacy at FreeBSD.org
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -379,7 +380,6 @@
 	mov	%g5, %o2
 	mov	%g6, %o3
 	mov	%g7, %o5
-	
 	ba,a,pt	%xcc, set_ackmask
 	  nop
 END(tl_invlctx)
@@ -417,6 +417,11 @@
 	mov	%g1, %o0
 	mov	%g2, %o1							
 	ta	MMU_UNMAP_ADDR
+	brz,pt	%o0, 1f
+	  nop
+	ba	panic_bad_hcall
+	   mov	MMU_UNMAP_ADDR, %o1
+1:
 	mov	%g5, %o0
 	mov	%g6, %o1
 	mov	%g7, %o2
@@ -425,16 +430,15 @@
 END(tl_invlpg)
 	
 ENTRY(set_ackmask)
+	membar	#Sync
 	GET_PCPU_PHYS_SCRATCH(%g6)
 	wr	%g0, ASI_REAL, %asi
-	membar	#LoadStore|#StoreStore
+	lda	[PCPU(CPUMASK)]%asi, %g4
 	lda	[%g3]%asi, %g1
-	lda	[PCPU(CPUMASK)]%asi, %g4
 1:	or	%g1, %g4, %g2
 	casa	[%g3]%asi, %g1, %g2
 	cmp	%g1, %g2
 	bne,a,pn %icc, 1b
 	  lda	[%g3]%asi, %g1
-	ba,a,pt	%xcc, cpu_mondo
-	  membar #StoreLoad|#StoreStore
+	retry
 END(set_ackmask)