From owner-p4-projects@FreeBSD.ORG  Fri Mar 17 02:19:22 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 837EF16A424; Fri, 17 Mar 2006 02:19:22 +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 5E9D916A422
	for <perforce@freebsd.org>; Fri, 17 Mar 2006 02:19:22 +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 2A65D43D46
	for <perforce@freebsd.org>; Fri, 17 Mar 2006 02:19:22 +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 k2H2JMZS029757
	for <perforce@freebsd.org>; Fri, 17 Mar 2006 02:19:22 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2H2JLIs029754
	for perforce@freebsd.org; Fri, 17 Mar 2006 02:19:21 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 17 Mar 2006 02:19:21 GMT
Message-Id: <200603170219.k2H2JLIs029754@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 93425 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, 17 Mar 2006 02:19:22 -0000

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

Change 93425 by kmacy@kmacy_storage:sun4v_work on 2006/03/17 02:19:09

	make MAGIC_TRAP definition dependent on SIMULATOR define
	fix invltlb to call DEMAP_ALL

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#3 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#10 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#11 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#3 (text+ko) ====

@@ -287,4 +287,17 @@
 #define	HVIO_FIRE_PERFREG_PCIE_LNK_CNT1	14
 #define	HVIO_FIRE_PERFREG_PCIE_LNK_CNT2	15
 
+
+
+#ifdef SIMULATOR
+#define MAGIC_TRAP_ON	ta	0x77
+#define MAGIC_TRAP_OFF	ta	0x78
+#define MAGIC_EXIT	ta	0x71
+#else
+#define MAGIC_TRAP_ON	nop
+#define MAGIC_TRAP_OFF	nop
+#define MAGIC_EXIT	nop
+#endif
+
+
 #endif	/*_MACHINE_HYPERVISORVAR_H_ */

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

@@ -742,6 +742,12 @@
  * 
  */		
 ENTRY(invlctx)
+	cmp	%o0, %g0
+	bne	%xcc, 2f
+	  nop
+	MAGIC_TRAP_ON
+	MAGIC_EXIT
+2:		
 	mov	%o0, %o2
 	mov	%g0, %o0
 	mov	%g0, %o1
@@ -761,7 +767,7 @@
 	mov	%g0, %o0
 	mov	%g0, %o1
 	mov	MAP_ITLB | MAP_DTLB, %o2
-	mov	MMU_DEMAP_CTX, %o5
+	mov	MMU_DEMAP_ALL, %o5
 	ta	FAST_TRAP
 	brz,pt	%o0, 1f
 	  nop

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

@@ -39,10 +39,6 @@
 	.register	%g3, #ignore
 
 #define	PCB_REG	%g6
-	
-#define MAGIC_EXIT	ta 0x71
-#define MAGIC_TRAP_ON	ta 0x77
-#define MAGIC_TRAP_OFF	ta 0x78
 /*
  * void cpu_throw(struct thread *old, struct thread *new)
  */