KVM: ARM: vgic: split GICv2 backend from the main vgic code

Brutally hack the innocent vgic code, and move the GICv2 specific code
to its own file, using vgic_ops and vgic_params as a way to pass
information between the two blocks.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index ce2e14226dbf..d8d52a9ca6a1 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -32,7 +32,8 @@
 #define VGIC_NR_PRIVATE_IRQS    (VGIC_NR_SGIS + VGIC_NR_PPIS)
 #define VGIC_NR_SHARED_IRQS     (VGIC_NR_IRQS - VGIC_NR_PRIVATE_IRQS)
 #define VGIC_MAX_CPUS           KVM_MAX_VCPUS
-#define VGIC_MAX_LRS            (1 << 6)
+
+#define VGIC_V2_MAX_LRS         (1 << 6)
 
 /* Sanity checks... */
 #if (VGIC_MAX_CPUS > 8)
@@ -162,7 +163,7 @@ struct vgic_v2_cpu_if {
         u32             vgic_eisr[2];   /* Saved only */
         u32             vgic_elrsr[2];  /* Saved only */
         u32             vgic_apr;
-        u32             vgic_lr[VGIC_MAX_LRS];
+        u32             vgic_lr[VGIC_V2_MAX_LRS];
 };
 
 struct vgic_cpu {
@@ -175,7 +176,7 @@ struct vgic_cpu {
         DECLARE_BITMAP( pending_shared, VGIC_NR_SHARED_IRQS);
 
         /* Bitmap of used/free list registers */
-        DECLARE_BITMAP( lr_used, VGIC_MAX_LRS);
+        DECLARE_BITMAP( lr_used, VGIC_V2_MAX_LRS);
 
         /* Number of list registers on this CPU */
         int             nr_lr;
@@ -214,6 +215,10 @@ bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,
 #define irqchip_in_kernel(k)    (!!((k)->arch.vgic.vctrl_base))
 #define vgic_initialized(k)     ((k)->arch.vgic.ready)
 
+int vgic_v2_probe(struct device_node *vgic_node,
+                  const struct vgic_ops **ops,
+                  const struct vgic_params **params);
+
 #else
 static inline int kvm_vgic_hyp_init(void)
 {