From owner-p4-projects@FreeBSD.ORG  Tue May 23 05:58:34 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B20BF16A439; Tue, 23 May 2006 05:58:34 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 75BCC16A429
	for <perforce@freebsd.org>; Tue, 23 May 2006 05:58:34 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C95AD43D5D
	for <perforce@freebsd.org>; Tue, 23 May 2006 05:58:31 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4N5vkUx005100
	for <perforce@freebsd.org>; Tue, 23 May 2006 05:57:46 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4N5vkAw005097
	for perforce@freebsd.org; Tue, 23 May 2006 05:57:46 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 23 May 2006 05:57:46 GMT
Message-Id: <200605230557.k4N5vkAw005097@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97668 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 May 2006 05:58:35 -0000

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

Change 97668 by kmacy@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@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)