Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2be6550 authored by Mihai Caraman's avatar Mihai Caraman Committed by Alexander Graf
Browse files

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: default avatarMihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 50c7bb80

arch/powerpc/kvm/book3s_emulate.c

+2 −0
Original line number Diff line number Diff line
@@ -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:

arch/powerpc/kvm/emulate.c

+0 −5
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ static int kvmppc_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs) 
	case SPRN_TBWL: break;

	case SPRN_TBWU: break;



	case SPRN_MSSSR0: break;



	case SPRN_DEC:

		vcpu->arch.dec = spr_val;

		kvmppc_emulate_dec(vcpu);
@@ -201,9 +199,6 @@ static int kvmppc_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt) 
	case SPRN_PIR:

		spr_val = vcpu->vcpu_id;

		break;

	case SPRN_MSSSR0:

		spr_val = 0;

		break;



	/* Note: mftb and TBRL/TBWL are user-accessible, so

	 * the guest can always access the real TB anyways.