From owner-p4-projects@FreeBSD.ORG  Sat Feb  2 23:43:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 733C116A418; Sat,  2 Feb 2008 23:43:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 38F0716A421
	for <perforce@freebsd.org>; Sat,  2 Feb 2008 23:43:40 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 27EA913C447
	for <perforce@freebsd.org>; Sat,  2 Feb 2008 23:43:40 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12NheuB087586
	for <perforce@freebsd.org>; Sat, 2 Feb 2008 23:43:40 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12NhdJ8087583
	for perforce@freebsd.org; Sat, 2 Feb 2008 23:43:39 GMT
	(envelope-from cognet@freebsd.org)
Date: Sat, 2 Feb 2008 23:43:39 GMT
Message-Id: <200802022343.m12NhdJ8087583@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134685 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, 02 Feb 2008 23:43:40 -0000

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

Change 134685 by cognet@cognet-mips on 2008/02/02 23:43:29

	Only clear the required bits from SR, instead of zeroing it, for 
	Octeon, or we will lose KX and bad things happen.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#10 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#10 (text+ko) ====

@@ -258,6 +258,17 @@
 #define	SAVE_REG(reg, offs, base) \
 	STORE	reg, STAND_ARG_SIZE + (RSIZE * offs) (base)
 
+#ifdef TARGET_OCTEON
+#define CLEAR_STATUS \
+	mfc0    a0, COP_0_STATUS_REG    ;\
+        li      a2, ~(SR_INT_ENAB | SR_EXL | SR_KSU_MASK) ;\
+        and     a0, a0, a2              ;\
+        mtc0    a0, COP_0_STATUS_REG    
+#else
+#define CLEAR_STATUS \
+	mtc0	zero, COP_0_STATUS_REG
+#endif
+
 #define	SAVE_CPU \
 	SAVE_REG(AT, AST, sp)		;\
 	SAVE_REG(v0, V0, sp)		;\
@@ -293,7 +304,7 @@
 	addu	v0, sp, KERN_EXC_FRAME_SIZE ;\
 	SAVE_REG(v0, SP, sp)		;\
 	addu	a0, sp, STAND_ARG_SIZE	;\
-	mtc0	zero,COP_0_STATUS_REG	;\
+	CLEAR_STATUS			;\
 	ITLBNOPFIX
 
 #ifdef DDB