From owner-svn-src-head@FreeBSD.ORG  Sun Nov 24 20:33:39 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 4D1709BD;
 Sun, 24 Nov 2013 20:33:39 +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 3C7792441;
 Sun, 24 Nov 2013 20:33:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOKXdME004535;
 Sun, 24 Nov 2013 20:33:39 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAOKXduC004534;
 Sun, 24 Nov 2013 20:33:39 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201311242033.rAOKXduC004534@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 24 Nov 2013 20:33:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258527 - head/sys/boot/arm/uboot
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Nov 2013 20:33:39 -0000

Author: andrew
Date: Sun Nov 24 20:33:38 2013
New Revision: 258527
URL: http://svnweb.freebsd.org/changeset/base/258527

Log:
  Recent versions of U-Boot require us to also backup and restore r9 for API
  calls to work.

Modified:
  head/sys/boot/arm/uboot/start.S

Modified: head/sys/boot/arm/uboot/start.S
==============================================================================
--- head/sys/boot/arm/uboot/start.S	Sun Nov 24 15:03:26 2013	(r258526)
+++ head/sys/boot/arm/uboot/start.S	Sun Nov 24 20:33:38 2013	(r258527)
@@ -39,9 +39,10 @@ _start:
 	ldr	ip, =uboot_address
 	str	sp, [ip]
 
-	/* Save U-Boot's r8 */
+	/* Save U-Boot's r8 and r9 */
 	ldr	ip, =saved_regs
 	str	r8, [ip, #0]
+	str	r9, [ip, #4]
 
 #ifdef _ARM_ARCH_6
 	mrc     p15, 0, r2, c1, c0, 0
@@ -57,21 +58,24 @@ _start:
  * syscall()
  */
 ENTRY(syscall)
-	/* Save caller's lr and r8 */
+	/* Save caller's lr, r8 and r9 */
 	ldr	ip, =saved_regs
-	str	lr, [ip, #4]
 	str	r8, [ip, #8]
-	/* Restore U-Boot's r8 */
+	str	r9, [ip, #12]
+	str	lr, [ip, #16]
+	/* Restore U-Boot's r8 and r9 */
 	ldr	r8, [ip, #0]
+	ldr	r9, [ip, #4]
 	/* Call into U-Boot */
 	ldr	lr, =return_from_syscall
 	ldr	ip, =syscall_ptr
 	ldr	pc, [ip]
 return_from_syscall:
-	/* Restore loader's r8 and lr */
+	/* Restore loader's r8, r9 and lr */
 	ldr	ip, =saved_regs
+	ldr	lr, [ip, #16]
+	ldr	r9, [ip, #12]
 	ldr	r8, [ip, #8]
-	ldr	lr, [ip, #4]
 	/* Return to caller */
 	mov	pc, lr
 
@@ -90,5 +94,7 @@ uboot_address:
 
 saved_regs:
 	.long	0	/* U-Boot's r8 */
+	.long	0	/* U-Boot's r9 */
 	.long	0	/* Loader's r8 */
+	.long	0	/* Loader's r9 */
 	.long	0	/* Loader's lr */