From owner-p4-projects@FreeBSD.ORG  Sat Mar 11 03:41:51 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 4326916A420; Sat, 11 Mar 2006 03:41:49 +0000 (GMT)
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 D1EC916A41F
	for <perforce@freebsd.org>; Sat, 11 Mar 2006 03:41:48 +0000 (GMT)
	(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 DD7EA43D6D
	for <perforce@freebsd.org>; Sat, 11 Mar 2006 03:41:47 +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 k2B3flF9055914
	for <perforce@freebsd.org>; Sat, 11 Mar 2006 03:41:47 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2B3flrM055911
	for perforce@freebsd.org; Sat, 11 Mar 2006 03:41:47 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 11 Mar 2006 03:41:47 GMT
Message-Id: <200603110341.k2B3flrM055911@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 93129 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: Sat, 11 Mar 2006 03:41:51 -0000

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

Change 93129 by kmacy@kmacy_storage:sun4v_work on 2006/03/11 03:41:12

	set tf pointer before calling ast
	raise tl before setting context
	correctly copy secondary context to primary context

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#24 edit

Differences ...

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

@@ -501,6 +501,8 @@
 
 	.macro	tl1_align
 	MAGIC_TRAP_ON
+	MAGIC_TRAP_ON
+	MAGIC_EXIT
 	.align	32
 	.endm		
 		
@@ -910,6 +912,7 @@
 	  mov	%l7, %o0
 
 ENTRY(user_rtt)
+	add	%sp, CCFSZ + SPOFF, %l7
 	! pil handling needs to be re-visited
 	wrpr	%g0, PIL_TICK, %pil
 	ldx	[PCPU(CURTHREAD)], %l0
@@ -950,9 +953,11 @@
 
 	wrpr	%g0, 0, %pil	! drop pil to 0
 
+	wrpr	%g0, 1, %tl	! raise tl -> 1 before setting pcontext
+	
 	mov	MMU_CID_S, %g1
 	GET_MMU_CONTEXT(%g1, %g2)
-	mov	MMU_CID_S, %g1
+	mov	MMU_CID_P, %g1
 	sethi	%hi(FLUSH_ADDR), %g3
 	SET_MMU_CONTEXT(%g1, %g2)
 	flush	%g3				! flush required by immu