diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2012-07-17 17:22:04 +0100 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2012-07-17 17:22:04 +0100 |
| commit | 327530963011cc10c929631e3460cec3d3f5c725 (patch) | |
| tree | 5b607db81d7e82b05accc9deb33e2d9572d05efe | |
| parent | 5ddc8ef0f89c08e705e047b97296146d87a284aa (diff) | |
| download | xen-327530963011cc10c929631e3460cec3d3f5c725.tar.gz xen-327530963011cc10c929631e3460cec3d3f5c725.tar.bz2 xen-327530963011cc10c929631e3460cec3d3f5c725.zip | |
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@eu.citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
| -rw-r--r-- | xen/arch/arm/gic.c | 4 | ||||
| -rw-r--r-- | xen/include/asm-arm/domain.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index ee83825761..94b7ad77a4 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -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 --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 230ea8c095..3576d507a6 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -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 { /* |