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

Commit fa73c3b2 authored by Thomas Huth's avatar Thomas Huth Committed by Paul Mackerras
Browse files

KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register 



The MMCR2 register is available twice, one time with number 785
(privileged access), and one time with number 769 (unprivileged,
but it can be disabled completely). In former times, the Linux
kernel was using the unprivileged register 769 only, but since
commit 8dd75ccb ("powerpc: Use privileged SPR number
for MMCR2"), it uses the privileged register 785 instead.
The KVM-PR code then of course also switched to use the SPR 785,
but this is causing older guest kernels to crash, since these
kernels still access 769 instead. So to support older kernels
with KVM-PR again, we have to support register 769 in KVM-PR, too.

Fixes: 8dd75ccb
Cc: stable@vger.kernel.org # v3.10+
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 2365f6b6

arch/powerpc/include/asm/reg.h

+1 −0
Original line number Diff line number Diff line
@@ -737,6 +737,7 @@ 
#define   MMCR0_FCHV	0x00000001UL /* freeze conditions in hypervisor mode */

#define SPRN_MMCR1	798

#define SPRN_MMCR2	785

#define SPRN_UMMCR2	769

#define SPRN_MMCRA	0x312

#define   MMCRA_SDSYNC	0x80000000UL /* SDAR synced with SIAR */

#define   MMCRA_SDAR_DCACHE_MISS 0x40000000UL

arch/powerpc/kvm/book3s_emulate.c

+2 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ int kvmppc_core_emulate_mtspr_pr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val) 
	case SPRN_MMCR0:

	case SPRN_MMCR1:

	case SPRN_MMCR2:

	case SPRN_UMMCR2:

#endif

		break;

unprivileged:
@@ -640,6 +641,7 @@ int kvmppc_core_emulate_mfspr_pr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val 
	case SPRN_MMCR0:

	case SPRN_MMCR1:

	case SPRN_MMCR2:

	case SPRN_UMMCR2:

	case SPRN_TIR:

#endif

		*spr_val = 0;