From owner-svn-soc-all@freebsd.org  Tue Jul 14 09:37:40 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 0C20599CFAE
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Tue, 14 Jul 2015 09:37:40 +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 F155BED2
 for <svn-soc-all@FreeBSD.org>; Tue, 14 Jul 2015 09:37:39 +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 t6E9bd2j064987
 for <svn-soc-all@FreeBSD.org>; Tue, 14 Jul 2015 09:37:39 GMT
 (envelope-from mihai@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6E9bdRQ064985
 for svn-soc-all@FreeBSD.org; Tue, 14 Jul 2015 09:37:39 GMT
 (envelope-from mihai@FreeBSD.org)
Date: Tue, 14 Jul 2015 09:37:39 GMT
Message-Id: <201507140937.t6E9bdRQ064985@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: r288364 - 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: Tue, 14 Jul 2015 09:37:40 -0000

Author: mihai
Date: Tue Jul 14 09:37:38 2015
New Revision: 288364
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288364

Log:
  soc2015: mihai: bhyve: sys: arm: vmm: arm.c: set reset state for CPSR

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

Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c	Tue Jul 14 08:02:05 2015	(r288363)
+++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c	Tue Jul 14 09:37:38 2015	(r288364)
@@ -36,7 +36,7 @@
 lpae_pd_entry_t *hyp_l1pd;
 char *stack;
 
-static uint64_t vmid_generation = 1;
+static uint64_t vmid_generation = 0;
 static struct mtx vmid_generation_mtx;
 
 static void set_vttbr(struct hyp* hyp) {
@@ -202,6 +202,7 @@
 		hypctx->mpidr = (cp15_mpidr_get() & MPIDR_SMP_MASK) |
 		    MPIDR_AFF1_LEVEL(i) |
 		    MPIDR_AFF0_LEVEL(i);
+		hypctx->regs.r_cpsr = PSR_SVC32_MODE | PSR_A | PSR_I | PSR_F;
 	}
 
 	lpae_vmmmap_set(NULL,
@@ -214,7 +215,7 @@
 }
 
 static int
-arm_vmrun(void *arg, int vcpu, register_t rip, pmap_t pmap, 
+arm_vmrun(void *arg, int vcpu, register_t pc, pmap_t pmap, 
 	void *rend_cookie, void *suspended_cookie)
 {
 	int rc;
@@ -231,8 +232,8 @@
 		handled = UNHANDLED;
 
 		rc = vmm_call_hyp((void *)hyp_enter_guest, hypctx);
-
-		handled = HANDLED;
+		printf("%s rc: %d\n",__func__, rc);
+//		handled = HANDLED;
 
 	} while(handled);
 	return 0;