From owner-p4-projects@FreeBSD.ORG  Fri May  5 03:40:46 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 CCA3516A40B; Fri,  5 May 2006 03:40:46 +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 5C71716A409
	for <perforce@freebsd.org>; Fri,  5 May 2006 03:40:46 +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 1CCBC43D48
	for <perforce@freebsd.org>; Fri,  5 May 2006 03:40:46 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k453ejID044890
	for <perforce@freebsd.org>; Fri, 5 May 2006 03:40:45 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k453ejmZ044884
	for perforce@freebsd.org; Fri, 5 May 2006 03:40:45 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 5 May 2006 03:40:45 GMT
Message-Id: <200605050340.k453ejmZ044884@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 96679 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: Fri, 05 May 2006 03:40:47 -0000

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

Change 96679 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/05 03:40:00

	agressively use membars when setting the ipi ackmask and follow the 
	solaris convention of explicitly reloading on a mismatch

Affected files ...

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

Differences ...

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

@@ -427,13 +427,14 @@
 ENTRY(set_ackmask)
 	GET_PCPU_PHYS_SCRATCH(%g6)
 	wr	%g0, ASI_REAL, %asi
+	membar	#LoadStore|#StoreStore
 	lda	[%g3]%asi, %g1
 	lda	[PCPU(CPUMASK)]%asi, %g4
 1:	or	%g1, %g4, %g2
 	casa	[%g3]%asi, %g1, %g2
 	cmp	%g1, %g2
-	bne,pn	%icc, 1b
-	  mov	%g2, %g1
+	bne,a,pn %icc, 1b
+	  lda	[%g3]%asi, %g1
 	ba,a,pt	%xcc, cpu_mondo
-	  membar #StoreLoad
+	  membar #StoreLoad|#StoreStore
 END(set_ackmask)