From owner-svn-soc-all@freebsd.org  Mon Jul 13 08:47:04 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A68E99BF86
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 13 Jul 2015 08:47:04 +0000 (UTC)
 (envelope-from mihai@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7B2DE1500
 for <svn-soc-all@FreeBSD.org>; Mon, 13 Jul 2015 08:47:04 +0000 (UTC)
 (envelope-from mihai@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6D8l4PS049796
 for <svn-soc-all@FreeBSD.org>; Mon, 13 Jul 2015 08:47:04 GMT
 (envelope-from mihai@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6D8l3pq049784
 for svn-soc-all@FreeBSD.org; Mon, 13 Jul 2015 08:47:03 GMT
 (envelope-from mihai@FreeBSD.org)
Date: Mon, 13 Jul 2015 08:47:03 GMT
Message-Id: <201507130847.t6D8l3pq049784@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 mihai@FreeBSD.org using -f
From: mihai@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r288274 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2015 08:47:04 -0000

Author: mihai
Date: Mon Jul 13 08:47:03 2015
New Revision: 288274
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288274

Log:
  soc2015: mihai: bhyve: sys: arm: vmm: hyp.S: fix HCR load and add a stub push

Modified:
  soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S

Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S	Mon Jul 13 08:45:41 2015	(r288273)
+++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S	Mon Jul 13 08:47:03 2015	(r288274)
@@ -68,7 +68,6 @@
 	orr     r1, r1, r2
 	mcr     p15, 4, r1, c1, c1, 2
 
-
 	restore_guest_regs
 
 	eret
@@ -100,7 +99,7 @@
 
 	/* Disable all traps - HCR */
 	mov	r2, #0
-	mcr	p15, 4, r1, c1, c1, 0
+	mcr	p15, 4, r2, c1, c1, 0
 
 
 	/* Save guest CP15 registers */
@@ -333,6 +332,7 @@
 	eret
 
 guest_bad_exception:
+	push	{r0, r1, r2}		@ Emulate a push to the stack to respect hyp_exit_guest restore convention
 	/* Load hypctx pointer to r0 */
 	mrc	p15, 4, r0, c13, c0, 2
 	// TODO: load HSR in VCPU