[Xen-changelog] [xen-unstable] arm/gic: fix gic context switch

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
# Date 1342542124 -3600
# Node ID b9ddef1a35c085c29bf69d7a2014226fa2f61f8d
# Parent  d53381ebdb3287d002e1179f6774516e70399490
arm/gic: fix gic context switch

gic_save/restore_state should also save and restore lr_mask and
event_mask too.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r d53381ebdb32 -r b9ddef1a35c0 xen/arch/arm/gic.c
--- a/xen/arch/arm/gic.c        Tue Jul 17 17:22:04 2012 +0100
+++ b/xen/arch/arm/gic.c        Tue Jul 17 17:22:04 2012 +0100
@@ -67,6 +67,8 @@ void gic_save_state(struct vcpu *v)
 
     for ( i=0; i<nr_lrs; i++)
         v->arch.gic_lr[i] = GICH[GICH_LR + i];
+    v->arch.lr_mask = gic.lr_mask;
+    v->arch.event_mask = gic.event_mask;
     /* Disable until next VCPU scheduled */
     GICH[GICH_HCR] = 0;
     isb();
@@ -79,6 +81,8 @@ void gic_restore_state(struct vcpu *v)
     if ( is_idle_vcpu(v) )
         return;
 
+    gic.lr_mask = v->arch.lr_mask;
+    gic.event_mask = v->arch.event_mask;
     for ( i=0; i<nr_lrs; i++)
         GICH[GICH_LR + i] = v->arch.gic_lr[i];
     GICH[GICH_HCR] = GICH_HCR_EN;
diff -r d53381ebdb32 -r b9ddef1a35c0 xen/include/asm-arm/domain.h
--- a/xen/include/asm-arm/domain.h      Tue Jul 17 17:22:04 2012 +0100
+++ b/xen/include/asm-arm/domain.h      Tue Jul 17 17:22:04 2012 +0100
@@ -121,6 +121,8 @@ struct arch_vcpu
 
     uint32_t gic_hcr, gic_vmcr, gic_apr;
     uint32_t gic_lr[64];
+    uint64_t event_mask;
+    uint64_t lr_mask;
 
     struct {
         /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog