From owner-svn-src-stable@FreeBSD.ORG  Wed Jan 29 20:48:27 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 14238115;
 Wed, 29 Jan 2014 20:48:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F314D13E0;
 Wed, 29 Jan 2014 20:48:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0TKmQr4039702;
 Wed, 29 Jan 2014 20:48:26 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0TKmQIJ039701;
 Wed, 29 Jan 2014 20:48:26 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201401292048.s0TKmQIJ039701@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 29 Jan 2014 20:48:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r261274 - stable/10/sys/mips/beri
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jan 2014 20:48:27 -0000

Author: brooks
Date: Wed Jan 29 20:48:26 2014
New Revision: 261274
URL: http://svnweb.freebsd.org/changeset/base/261274

Log:
  MFC r256745:
  
  MFP4:
  Change 227630 by bz@bz_zenith on 2013/04/12 08:50:27
  
  	Implement soft reset setting sr in sr and just in case loop
  	endlessly afterwards.
  
  Sponsored by:	DARPA/AFRL

Modified:
  stable/10/sys/mips/beri/beri_machdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/mips/beri/beri_machdep.c
==============================================================================
--- stable/10/sys/mips/beri/beri_machdep.c	Wed Jan 29 19:31:58 2014	(r261273)
+++ stable/10/sys/mips/beri/beri_machdep.c	Wed Jan 29 20:48:26 2014	(r261274)
@@ -116,14 +116,19 @@ mips_init(void)
 
 /*
  * 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