From owner-p4-projects@FreeBSD.ORG  Wed May 17 00:44:02 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 4009B16A407; Wed, 17 May 2006 00:44:02 +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 A8B3C16A400
	for <perforce@freebsd.org>; Wed, 17 May 2006 00:44:01 +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 5BD1E43D46
	for <perforce@freebsd.org>; Wed, 17 May 2006 00:44:01 +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 k4H0hhAl012191
	for <perforce@freebsd.org>; Wed, 17 May 2006 00:43:43 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4H0hhCh012188
	for perforce@freebsd.org; Wed, 17 May 2006 00:43:43 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 17 May 2006 00:43:43 GMT
Message-Id: <200605170043.k4H0hhCh012188@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 97314 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: Wed, 17 May 2006 00:44:03 -0000

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

Change 97314 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/05/17 00:42:49

	create separate pcpu wbuf for tsb miss handler
	l3 isn't always set correctly in trap path so call trap directly

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#13 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#52 edit

Differences ...

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

@@ -73,9 +73,10 @@
 	u_long  pc_last_field;                                          \
 	u_long	pc_tickadj;						\
 	u_int 	pc_mid;							\
-	struct rwindow pc_kwbuf[2];                                     \
-	u_long  pc_kwbuf_sp[2];                                         \
-	u_int   pc_kwbuf_full[2];                                       \
+	struct rwindow pc_kwbuf;                                        \
+	u_long  pc_kwbuf_sp;                                            \
+	u_int   pc_kwbuf_full;                                          \
+	struct rwindow pc_tsbwbuf[2];                                   \
 	u_int   pc_node;                                                \
         uint16_t pc_cpulist[MAXCPU]
 

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

@@ -1108,6 +1108,7 @@
 	  nop	
 	call	spinlock_enter
 	  nop
+common_kintr:	
 	jmpl	%l3, %o7			! call trap handler
 	  mov	%l7, %o0
 	call	spinlock_exit
@@ -1115,7 +1116,8 @@
 	b	common_rtt
 	  nop
 common_ktrap:
-	jmpl	%l3, %o7			! call trap handler
+!	jmpl	%l3, %o7			! call trap handler
+	call	trap
 	  mov	%l7, %o0
 	
 ENTRY(krtt)
@@ -1377,7 +1379,7 @@
 	rdpr	%tl, cansave	; \
 	dec	cansave		; \
 	sll	cansave, RW_SHIFT, cansave ; \
-	add	cansave, PC_KWBUF, cansave ; \
+	add	cansave, PC_TSBWBUF, cansave ; \
 	add	pcpu, cansave, cansave ; \
 	RESTORE_LOCALS_ASI(cansave) ; \
 label2:	
@@ -1453,7 +1455,7 @@
 	rdpr	%tl, %g1
 	dec	%g1	
 	sll	%g1, RW_SHIFT, %g1
-	add	%g1, PC_KWBUF, %g1
+	add	%g1, PC_TSBWBUF, %g1
 	add	PCPU_REG, %g1, %g1
 	SAVE_LOCALS_ASI(%g1)
 	mov	0, %g1			! cansave is 0