Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Apr 2013 17:30:28 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 227709 for review
Message-ID:  <201304141730.r3EHUS2J077840@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304141730.r3EHUS2J077840>