KVM: ARM: vgic: add the GICv3 backend

Introduce the support code for emulating a GICv2 on top of GICv3
hardware.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

1 files changed, 28 insertions, 0 deletions

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 65f1121a3beb..35b0c121bb65 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -33,6 +33,7 @@
 #define VGIC_MAX_CPUS           KVM_MAX_VCPUS
 
 #define VGIC_V2_MAX_LRS         (1 << 6)
+#define VGIC_V3_MAX_LRS         16
 
 /* Sanity checks... */
 #if (VGIC_MAX_CPUS > 8)
@@ -72,6 +73,7 @@ struct kvm_vcpu;
 
 enum vgic_type {
         VGIC_V2,                /* Good ol' GICv2 */
+        VGIC_V3,                /* New fancy GICv3 */
 };
 
 #define LR_STATE_PENDING        (1 << 0)
@@ -172,6 +174,19 @@ struct vgic_v2_cpu_if {
         u32             vgic_lr[VGIC_V2_MAX_LRS];
 };
 
+struct vgic_v3_cpu_if {
+#ifdef CONFIG_ARM_GIC_V3
+        u32             vgic_hcr;
+        u32             vgic_vmcr;
+        u32             vgic_misr;      /* Saved only */
+        u32             vgic_eisr;      /* Saved only */
+        u32             vgic_elrsr;     /* Saved only */
+        u32             vgic_ap0r[4];
+        u32             vgic_ap1r[4];
+        u64             vgic_lr[VGIC_V3_MAX_LRS];
+#endif
+};
+
 struct vgic_cpu {
 #ifdef CONFIG_KVM_ARM_VGIC
         /* per IRQ to LR mapping */
@@ -190,6 +205,7 @@ struct vgic_cpu {
         /* CPU vif control registers for world switch */
         union {
                 struct vgic_v2_cpu_if   vgic_v2;
+                struct vgic_v3_cpu_if   vgic_v3;
         };
 #endif
 };
@@ -224,6 +240,18 @@ bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,
 int vgic_v2_probe(struct device_node *vgic_node,
                   const struct vgic_ops **ops,
                   const struct vgic_params **params);
+#ifdef CONFIG_ARM_GIC_V3
+int vgic_v3_probe(struct device_node *vgic_node,
+                  const struct vgic_ops **ops,
+                  const struct vgic_params **params);
+#else
+static inline int vgic_v3_probe(struct device_node *vgic_node,
+                                const struct vgic_ops **ops,
+                                const struct vgic_params **params)
+{
+        return -ENODEV;
+}
+#endif
 
 #else
 static inline int kvm_vgic_hyp_init(void)