[PATCH v3 08/16] arm/xen: move GIC context data structure to gic driver

[vijay.kilari@gmail.com]

From: Vijaya Kumar K <Vijaya.Kumar@caviumnetworks.com>

GIC specific context data structure that saves and restores
GIC  registers are moved to gic.h from domain.h
The structure is converted to union so that we can
add version specific structure to this union for
later GIC versions.

Signed-off-by: Vijaya Kumar K <Vijaya.Kumar@caviumnetworks.com>
---
 xen/arch/arm/gic-v2.c        |   14 +++++++-------
 xen/include/asm-arm/domain.h |    4 ++--
 xen/include/asm-arm/gic.h    |   10 ++++++++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 0c0fa86..7c63bae 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -89,9 +89,9 @@ static void gicv2_save_state(struct vcpu *v)
      * accessed simultaneously by another pCPU.
      */
     for ( i = 0; i < nr_lrs; i++ )
-        v->arch.gic_lr[i] = GICH[GICH_LR + i];
-    v->arch.gic_apr = GICH[GICH_APR];
-    v->arch.gic_vmcr = GICH[GICH_VMCR];
+        v->arch.gic.v2.lr[i] = GICH[GICH_LR + i];
+    v->arch.gic.v2.apr = GICH[GICH_APR];
+    v->arch.gic.v2.vmcr = GICH[GICH_VMCR];
     /* Disable until next VCPU scheduled */
     GICH[GICH_HCR] = 0;
 }
@@ -101,9 +101,9 @@ static void gicv2_restore_state(struct vcpu *v)
     int i;
 
     for ( i = 0; i < nr_lrs; i++ )
-        GICH[GICH_LR + i] = v->arch.gic_lr[i];
-    GICH[GICH_APR] = v->arch.gic_apr;
-    GICH[GICH_VMCR] = v->arch.gic_vmcr;
+        GICH[GICH_LR + i] = v->arch.gic.v2.lr[i];
+    GICH[GICH_APR] = v->arch.gic.v2.apr;
+    GICH[GICH_VMCR] = v->arch.gic.v2.vmcr;
     GICH[GICH_HCR] = GICH_HCR_EN;
 }
 
@@ -116,7 +116,7 @@ static void gicv2_dump_state(struct vcpu *v)
             printk("   HW_LR[%d]=%x\n", i, GICH[GICH_LR + i]);
     } else {
         for ( i = 0; i < nr_lrs; i++ )
-            printk("   VCPU_LR[%d]=%x\n", i, v->arch.gic_lr[i]);
+            printk("   VCPU_LR[%d]=%x\n", i, v->arch.gic.v2.lr[i]);
     }
 }
 
diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
index 999bbdd..be1b084 100644
--- a/xen/include/asm-arm/domain.h
+++ b/xen/include/asm-arm/domain.h
@@ -8,6 +8,7 @@
 #include <asm/p2m.h>
 #include <asm/vfp.h>
 #include <asm/mmio.h>
+#include <asm/gic.h>
 #include <public/hvm/params.h>
 #include <xen/serial.h>
 
@@ -260,8 +261,7 @@ struct arch_vcpu
     uint32_t csselr;
     register_t vmpidr;
 
-    uint32_t gic_hcr, gic_vmcr, gic_apr;
-    uint32_t gic_lr[64];
+    union gic_state_data gic;
     uint64_t event_mask;
     uint64_t lr_mask;
 
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 2387e38..42f0e79 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -62,6 +62,16 @@
 #define DT_MATCH_GIC    DT_MATCH_COMPATIBLE("arm,cortex-a15-gic"), \
                         DT_MATCH_COMPATIBLE("arm,cortex-a7-gic")
 
+struct gic_v2 {
+    uint32_t hcr, vmcr;
+    uint32_t apr;
+    uint32_t lr[64];
+};
+
+union gic_state_data {
+    struct gic_v2 v2;
+};
+
 /*
  * Decode LR register content and populate below struct.
  * The LR register format is different for GIC HW version
-- 
1.7.9.5