From owner-p4-projects@FreeBSD.ORG  Sun Apr 14 17:30:29 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 328BEEBD; Sun, 14 Apr 2013 17:30:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E8B0EEBB
 for <perforce@freebsd.org>; Sun, 14 Apr 2013 17:30:28 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D9EC9A3D
 for <perforce@freebsd.org>; Sun, 14 Apr 2013 17:30:28 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3EHUSwI077843
 for <perforce@freebsd.org>; Sun, 14 Apr 2013 17:30:28 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3EHUS2J077840
 for perforce@freebsd.org; Sun, 14 Apr 2013 17:30:28 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 14 Apr 2013 17:30:28 GMT
Message-Id: <201304141730.r3EHUS2J077840@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 227709 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Sun, 14 Apr 2013 17:30:29 -0000

http://p4web.freebsd.org/@@227709?ac=10

Change 227709 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/14 17:30:12

	Integrate bz's @227630 from FreeBSD/BERI to CheriBSD:
	
	  Implement soft reset setting sr in sr and just in case loop
	  endlessly afterwards.
	
	  X-TODO: revisit for cheri2/SMP.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/beri_machdep.c#7 integrate

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/beri_machdep.c#7 (text+ko) ====

@@ -116,14 +116,19 @@
 
 /*
  * Perform a board-level soft-reset.
- *
- * XXXRW: BERI doesn't yet have a board-level soft-reset.
  */
 void
 platform_reset(void)
 {
 
-	panic("%s: not yet", __func__);
+	/* XXX SMP will likely require us to do more. */
+	__asm__ __volatile__(
+		"mfc0 $k0, $12\n\t"
+		"li $k1, 0x00100000\n\t"
+		"or $k0, $k0, $k1\n\t"
+		"mtc0 $k0, $12\n");
+	for( ; ; )
+		__asm__ __volatile("wait");
 }
 
 void