diff options
author | Mihai Caraman <mihai.caraman@freescale.com> | 2012-12-20 04:52:39 +0000 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-01-10 13:30:11 +0100 |
commit | f2be655004ddc36f2c5fc5e541d481dcd782ab83 (patch) | |
tree | e1f4b11ddc0bee6a72ca95f2e57bdefad566fe31 /arch/powerpc/kvm/book3s_emulate.c | |
parent | 50c7bb80b5bd5a9962905306dd2292eeb9857d46 (diff) | |
download | blackbird-op-linux-f2be655004ddc36f2c5fc5e541d481dcd782ab83.tar.gz blackbird-op-linux-f2be655004ddc36f2c5fc5e541d481dcd782ab83.zip |
KVM: PPC: Fix mfspr/mtspr MMUCFG emulation
On mfspr/mtspr emulation path Book3E's MMUCFG SPR with value 1015 clashes
with G4's MSSSR0 SPR. Move MSSSR0 emulation from generic part to Books3S.
MSSSR0 also clashes with Book3S's DABRX SPR. DABRX was not explicitly
handled so Book3S execution flow will behave as before.
Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm/book3s_emulate.c')
-rw-r--r-- | arch/powerpc/kvm/book3s_emulate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_emulate.c b/arch/powerpc/kvm/book3s_emulate.c index c88161bed8df..836c56975e21 100644 --- a/arch/powerpc/kvm/book3s_emulate.c +++ b/arch/powerpc/kvm/book3s_emulate.c @@ -455,6 +455,7 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val) case SPRN_PMC3_GEKKO: case SPRN_PMC4_GEKKO: case SPRN_WPAR_GEKKO: + case SPRN_MSSSR0: break; unprivileged: default: @@ -551,6 +552,7 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val) case SPRN_PMC3_GEKKO: case SPRN_PMC4_GEKKO: case SPRN_WPAR_GEKKO: + case SPRN_MSSSR0: *spr_val = 0; break; default: |