From owner-svn-src-all@FreeBSD.ORG  Fri Jan 22 09:19:57 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86C90106566B;
	Fri, 22 Jan 2010 09:19:57 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 756EE8FC0C;
	Fri, 22 Jan 2010 09:19:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0M9Jvts019726;
	Fri, 22 Jan 2010 09:19:57 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0M9JvQj019724;
	Fri, 22 Jan 2010 09:19:57 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001220919.o0M9JvQj019724@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 22 Jan 2010 09:19:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202785 - head/sys/mips/cavium
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2010 09:19:57 -0000

Author: imp
Date: Fri Jan 22 09:19:57 2010
New Revision: 202785
URL: http://svn.freebsd.org/changeset/base/202785

Log:
  Jump to the mips reset vector.  OR in the 0x80000000 for kseg0 and
  cast it to a long so it will work on 64-bit targets.
  
  reset now works on octeon, so I don't have to power cycle the board as
  often.

Modified:
  head/sys/mips/cavium/octeon_machdep.c

Modified: head/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- head/sys/mips/cavium/octeon_machdep.c	Fri Jan 22 08:51:58 2010	(r202784)
+++ head/sys/mips/cavium/octeon_machdep.c	Fri Jan 22 09:19:57 2010	(r202785)
@@ -99,7 +99,7 @@ platform_cpu_init()
 void
 platform_reset(void)
 {
-	((void(*)(void))0x1fc00000)();	/* Jump to this hex address */
+	((void(*)(void))(long)0x9fc00000)();	/* Jump to MIPS reset vector */
 }