From owner-svn-soc-all@freebsd.org Mon Aug 10 18:43:03 2015 Return-Path: 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 DAF2C99E7AA for ; Mon, 10 Aug 2015 18:43:03 +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 CB6E16E6 for ; Mon, 10 Aug 2015 18:43:03 +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 t7AIh3dd075838 for ; Mon, 10 Aug 2015 18:43:03 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7AIh3up075835 for svn-soc-all@FreeBSD.org; Mon, 10 Aug 2015 18:43:03 GMT (envelope-from mihai@FreeBSD.org) Date: Mon, 10 Aug 2015 18:43:03 GMT Message-Id: <201508101843.t7AIh3up075835@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: r289534 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2015 18:43:03 -0000 Author: mihai Date: Mon Aug 10 18:43:02 2015 New Revision: 289534 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289534 Log: sys: arm: vmm: arm.h: added vgic fields for a vcpu and vgic_distributor for a VM Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h Mon Aug 10 18:42:18 2015 (r289533) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h Mon Aug 10 18:43:02 2015 (r289534) @@ -1,4 +1,5 @@ #include "mmu.h" +#include "vgic.h" #include struct hypctx { @@ -67,17 +68,19 @@ uint32_t hifar; /* VA at a Prefetch Abort exception */ uint32_t hpfar; /* IPA[39:12] at aborts on stage 2 address translations */ } exit_info; - + struct vgic_cpu_int vgic_cpu_int; }; struct hyp { - lpae_pd_entry_t l1pd[2 * LPAE_L1_ENTRIES]; - lpae_pd_entry_t vttbr; - uint64_t vmid_generation; - struct vm *vm; - lpae_pd_entry_t l1pd_phys; - struct hypctx ctx[VM_MAXCPU]; - }; + lpae_pd_entry_t l1pd[2 * LPAE_L1_ENTRIES]; + lpae_pd_entry_t vttbr; + uint64_t vmid_generation; + struct vm *vm; + lpae_pd_entry_t l1pd_phys; + struct hypctx ctx[VM_MAXCPU]; + bool vgic_attached; + struct vgic_distributor vgic_distributor; +}; CTASSERT((offsetof(struct hyp, l1pd) & PAGE_MASK) == 0); uint64_t vmm_call_hyp(void *hyp_func_addr, ...); @@ -94,6 +97,3 @@ #define MPIDR_SMP_MASK (0x3 << 30) #define MPIDR_AFF1_LEVEL(x) ((x >> 2) << 8) #define MPIDR_AFF0_LEVEL(x) ((x & 0x3) << 0) - - -