Date: Tue, 14 Jul 2015 09:37:39 GMT From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288364 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm Message-ID: <201507140937.t6E9bdRQ064985@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507140937.t6E9bdRQ064985>