Commit 9c75f65f authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

KVM: PPC: Book3S HV P9: Test dawr_enabled() before saving host DAWR SPRs 



Some of the DAWR SPR access is already predicated on dawr_enabled(),
apply this to the remainder of the accesses.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211123095231.1036501-41-npiggin@gmail.com
parent cf3b16cf

arch/powerpc/kvm/book3s_hv_p9_entry.c

+20 −14
Original line number Diff line number Diff line
@@ -666,14 +666,17 @@ int kvmhv_vcpu_entry_p9(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpc 


	host_hfscr = mfspr(SPRN_HFSCR);

	host_ciabr = mfspr(SPRN_CIABR);

	host_dawr0 = mfspr(SPRN_DAWR0);

	host_dawrx0 = mfspr(SPRN_DAWRX0);

	host_psscr = mfspr(SPRN_PSSCR);

	host_pidr = mfspr(SPRN_PID);



	if (dawr_enabled()) {

		host_dawr0 = mfspr(SPRN_DAWR0);

		host_dawrx0 = mfspr(SPRN_DAWRX0);

		if (cpu_has_feature(CPU_FTR_DAWR1)) {

			host_dawr1 = mfspr(SPRN_DAWR1);

			host_dawrx1 = mfspr(SPRN_DAWRX1);

		}

	}



	local_paca->kvm_hstate.host_purr = mfspr(SPRN_PURR);

	local_paca->kvm_hstate.host_spurr = mfspr(SPRN_SPURR);
@@ -1006,6 +1009,8 @@ int kvmhv_vcpu_entry_p9(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpc 
	mtspr(SPRN_HFSCR, host_hfscr);

	if (vcpu->arch.ciabr != host_ciabr)

		mtspr(SPRN_CIABR, host_ciabr);



	if (dawr_enabled()) {

		if (vcpu->arch.dawr0 != host_dawr0)

			mtspr(SPRN_DAWR0, host_dawr0);

		if (vcpu->arch.dawrx0 != host_dawrx0)
@@ -1016,6 +1021,7 @@ int kvmhv_vcpu_entry_p9(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpc 
			if (vcpu->arch.dawrx1 != host_dawrx1)

				mtspr(SPRN_DAWRX1, host_dawrx1);

		}

	}



	if (vc->dpdes)

		mtspr(SPRN_DPDES, 0);