Date: Mon, 10 Aug 2015 18:43:03 GMT From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289534 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm Message-ID: <201508101843.t7AIh3up075835@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <machine/reg.h> 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) - - -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508101843.t7AIh3up075835>