diff options
| author |   Radim Krčmář <rkrcmar@redhat.com> | 2017-04-05 16:27:47 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-05 16:27:47 +0200 |
| commit | 6fd6410311d618d80748b0a5dd3e8d6cd17662bc (patch) | |
| tree | 5bc09692135e712549f8184f35bc5501b3bd2f7f /virt/kvm/arm/vgic/vgic.h | |
| parent | KVM: nVMX: initialize PML fields in vmcs02 (diff) | |
| parent | KVM: arm/arm64: vgic: Fix GICC_PMR uaccess on GICv3 and clarify ABI (diff) | |
| download | linux-dev-6fd6410311d618d80748b0a5dd3e8d6cd17662bc.tar.xz linux-dev-6fd6410311d618d80748b0a5dd3e8d6cd17662bc.zip | |
Merge tag 'kvm-arm-for-v4.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
From: Christoffer Dall <cdall@linaro.org>
KVM/ARM Fixes for v4.11-rc6
Fixes include:
- Fix a problem with GICv3 userspace save/restore
- Clarify GICv2 userspace save/restore ABI
- Be more careful in clearing GIC LRs
- Add missing synchronization primitive to our MMU handling code
Diffstat (limited to 'virt/kvm/arm/vgic/vgic.h')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/vgic.h b/virt/kvm/arm/vgic/vgic.h index db28f7cadab2..6cf557e9f718 100644 --- a/virt/kvm/arm/vgic/vgic.h +++ b/virt/kvm/arm/vgic/vgic.h @@ -81,11 +81,18 @@ static inline bool irq_is_pending(struct vgic_irq *irq) return irq->pending_latch || irq->line_level; } +/* + * This struct provides an intermediate representation of the fields contained + * in the GICH_VMCR and ICH_VMCR registers, such that code exporting the GIC + * state to userspace can generate either GICv2 or GICv3 CPU interface + * registers regardless of the hardware backed GIC used. + */ struct vgic_vmcr { u32 ctlr; u32 abpr; u32 bpr; - u32 pmr; + u32 pmr; /* Priority mask field in the GICC_PMR and + * ICC_PMR_EL1 priority field format */ /* Below member variable are valid only for GICv3 */ u32 grpen0; u32 grpen1; @@ -130,6 +137,8 @@ int vgic_v2_map_resources(struct kvm *kvm); int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address, enum vgic_type); +void vgic_v2_init_lrs(void); + static inline void vgic_get_irq_kref(struct vgic_irq *irq) { if (irq->intid < VGIC_MIN_LPI) |