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

Commit 30124906 authored by Varun Sethi's avatar Varun Sethi Committed by Alexander Graf
Browse files

KVM: PPC: booke(hv): Fix save/restore of guest accessible SPRGs. 



For Guest accessible SPRGs 4-7, save/restore must be handled differently for 64bit and
non-64 bit case. Use the PPC_STD/PPC_LD macros for saving/restoring to/from these registers.

Signed-off-by: default avatarVarun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 3d4c6826

arch/powerpc/kvm/booke_interrupts.S

+4 −4
Original line number Original line Diff line number Diff line
@@ -419,13 +419,13 @@ lightweight_exit: 
	 * written directly to the shared area, so we

	 * written directly to the shared area, so we

	 * need to reload them here with the guest's values.

	 * need to reload them here with the guest's values.

	 */

	 */

	lwz	r3, VCPU_SHARED_SPRG4(r5)

	PPC_LD(r3, VCPU_SHARED_SPRG4, r5)

	mtspr	SPRN_SPRG4W, r3

	mtspr	SPRN_SPRG4W, r3

	lwz	r3, VCPU_SHARED_SPRG5(r5)

	PPC_LD(r3, VCPU_SHARED_SPRG5, r5)

	mtspr	SPRN_SPRG5W, r3

	mtspr	SPRN_SPRG5W, r3

	lwz	r3, VCPU_SHARED_SPRG6(r5)

	PPC_LD(r3, VCPU_SHARED_SPRG6, r5)

	mtspr	SPRN_SPRG6W, r3

	mtspr	SPRN_SPRG6W, r3

	lwz	r3, VCPU_SHARED_SPRG7(r5)

	PPC_LD(r3, VCPU_SHARED_SPRG7, r5)

	mtspr	SPRN_SPRG7W, r3

	mtspr	SPRN_SPRG7W, r3





#ifdef CONFIG_KVM_EXIT_TIMING

#ifdef CONFIG_KVM_EXIT_TIMING

arch/powerpc/kvm/bookehv_interrupts.S

+8 −8
Original line number Original line Diff line number Diff line
@@ -316,13 +316,13 @@ _GLOBAL(kvmppc_resume_host) 
	PPC_STL	r5, VCPU_LR(r4)

	PPC_STL	r5, VCPU_LR(r4)

	mfspr	r7, SPRN_SPRG5

	mfspr	r7, SPRN_SPRG5

	PPC_STL	r3, VCPU_VRSAVE(r4)

	PPC_STL	r3, VCPU_VRSAVE(r4)

	PPC_STL	r6, VCPU_SHARED_SPRG4(r11)

	PPC_STD(r6, VCPU_SHARED_SPRG4, r11)

	mfspr	r8, SPRN_SPRG6

	mfspr	r8, SPRN_SPRG6

	PPC_STL	r7, VCPU_SHARED_SPRG5(r11)

	PPC_STD(r7, VCPU_SHARED_SPRG5, r11)

	mfspr	r9, SPRN_SPRG7

	mfspr	r9, SPRN_SPRG7

	PPC_STL	r8, VCPU_SHARED_SPRG6(r11)

	PPC_STD(r8, VCPU_SHARED_SPRG6, r11)

	mfxer	r3

	mfxer	r3

	PPC_STL	r9, VCPU_SHARED_SPRG7(r11)

	PPC_STD(r9, VCPU_SHARED_SPRG7, r11)





	/* save guest MAS registers and restore host mas4 & mas6 */

	/* save guest MAS registers and restore host mas4 & mas6 */

	mfspr	r5, SPRN_MAS0

	mfspr	r5, SPRN_MAS0
@@ -537,13 +537,13 @@ lightweight_exit: 
	 * SPRGs, so we need to reload them here with the guest's values.

	 * SPRGs, so we need to reload them here with the guest's values.

	 */

	 */

	lwz	r3, VCPU_VRSAVE(r4)

	lwz	r3, VCPU_VRSAVE(r4)

	lwz	r5, VCPU_SHARED_SPRG4(r11)

	PPC_LD(r5, VCPU_SHARED_SPRG4, r11)

	mtspr	SPRN_VRSAVE, r3

	mtspr	SPRN_VRSAVE, r3

	lwz	r6, VCPU_SHARED_SPRG5(r11)

	PPC_LD(r6, VCPU_SHARED_SPRG5, r11)

	mtspr	SPRN_SPRG4W, r5

	mtspr	SPRN_SPRG4W, r5

	lwz	r7, VCPU_SHARED_SPRG6(r11)

	PPC_LD(r7, VCPU_SHARED_SPRG6, r11)

	mtspr	SPRN_SPRG5W, r6

	mtspr	SPRN_SPRG5W, r6

	lwz	r8, VCPU_SHARED_SPRG7(r11)

	PPC_LD(r8, VCPU_SHARED_SPRG7, r11)

	mtspr	SPRN_SPRG6W, r7

	mtspr	SPRN_SPRG6W, r7

	mtspr	SPRN_SPRG7W, r8

	mtspr	SPRN_SPRG7W, r8