From owner-svn-soc-all@freebsd.org  Mon Jul 27 07:21:19 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 C11E39AC46D
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 27 Jul 2015 07:21:19 +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 A17DADA2
 for <svn-soc-all@FreeBSD.org>; Mon, 27 Jul 2015 07:21:19 +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 t6R7LJmf071134
 for <svn-soc-all@FreeBSD.org>; Mon, 27 Jul 2015 07:21:19 GMT
 (envelope-from mihai@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6R7LJLg071130
 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 07:21:19 GMT
 (envelope-from mihai@FreeBSD.org)
Date: Mon, 27 Jul 2015 07:21:19 GMT
Message-Id: <201507270721.t6R7LJLg071130@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: r288801 - 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, 27 Jul 2015 07:21:19 -0000

Author: mihai
Date: Mon Jul 27 07:21:18 2015
New Revision: 288801
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288801

Log:
  soc2015: mihai: bhyve-arm: sys: arm: vmm: hyp.S: handle irq exception

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 27 07:20:19 2015	(r288800)
+++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S	Mon Jul 27 07:21:18 2015	(r288801)
@@ -311,10 +311,15 @@
 
 	.align
 hyp_fiq:
-	b loop
+	b	loop
+
 	.align
 hyp_irq:
-	b loop
+	push	{r0, r1, r2}		@ Save registers in order to use them
+	/* Load hypctx pointer to r0 */
+	mrc	p15, 4, r0, c13, c0, 2
+	mov	r1, #EXCEPTION_IRQ
+	b	hyp_exit_guest
 	.align
 
 ENTRY(handle_bad_exception)
@@ -337,7 +342,6 @@
 	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
 	b	hyp_exit_guest
 END(handle_bad_exception)