Commit 736df58f authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: guard optional TIDR SPR with CPU ftr test 



The TIDR SPR only exists on POWER9. Avoid accessing it when the
feature bit for it is not set.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Reviewed-by: default avatarFabiano Rosas <farosas@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211123095231.1036501-3-npiggin@gmail.com
parent f53884b1

arch/powerpc/kvm/book3s_hv.c

+8 −4
Original line number Diff line number Diff line
@@ -3780,6 +3780,7 @@ static void load_spr_state(struct kvm_vcpu *vcpu) 
	mtspr(SPRN_EBBHR, vcpu->arch.ebbhr);

	mtspr(SPRN_EBBRR, vcpu->arch.ebbrr);

	mtspr(SPRN_BESCR, vcpu->arch.bescr);

	if (cpu_has_feature(CPU_FTR_P9_TIDR))

		mtspr(SPRN_TIDR, vcpu->arch.tid);

	mtspr(SPRN_AMR, vcpu->arch.amr);

	mtspr(SPRN_UAMOR, vcpu->arch.uamor);
@@ -3806,6 +3807,7 @@ static void store_spr_state(struct kvm_vcpu *vcpu) 
	vcpu->arch.ebbhr = mfspr(SPRN_EBBHR);

	vcpu->arch.ebbrr = mfspr(SPRN_EBBRR);

	vcpu->arch.bescr = mfspr(SPRN_BESCR);

	if (cpu_has_feature(CPU_FTR_P9_TIDR))

		vcpu->arch.tid = mfspr(SPRN_TIDR);

	vcpu->arch.amr = mfspr(SPRN_AMR);

	vcpu->arch.uamor = mfspr(SPRN_UAMOR);
@@ -3826,6 +3828,7 @@ struct p9_host_os_sprs { 
static void save_p9_host_os_sprs(struct p9_host_os_sprs *host_os_sprs)

{

	host_os_sprs->dscr = mfspr(SPRN_DSCR);

	if (cpu_has_feature(CPU_FTR_P9_TIDR))

		host_os_sprs->tidr = mfspr(SPRN_TIDR);

	host_os_sprs->iamr = mfspr(SPRN_IAMR);

	host_os_sprs->amr = mfspr(SPRN_AMR);
@@ -3840,6 +3843,7 @@ static void restore_p9_host_os_sprs(struct kvm_vcpu *vcpu, 
	mtspr(SPRN_UAMOR, 0);



	mtspr(SPRN_DSCR, host_os_sprs->dscr);

	if (cpu_has_feature(CPU_FTR_P9_TIDR))

		mtspr(SPRN_TIDR, host_os_sprs->tidr);

	mtspr(SPRN_IAMR, host_os_sprs->iamr);

arch/powerpc/xmon/xmon.c

+8 −2
Original line number Diff line number Diff line
@@ -2107,8 +2107,14 @@ static void dump_300_sprs(void) 
	if (!cpu_has_feature(CPU_FTR_ARCH_300))

		return;



	if (cpu_has_feature(CPU_FTR_P9_TIDR)) {

		printf("pidr   = %.16lx  tidr  = %.16lx\n",

			mfspr(SPRN_PID), mfspr(SPRN_TIDR));

	} else {

		printf("pidr   = %.16lx\n",

			mfspr(SPRN_PID));

	}



	printf("psscr  = %.16lx\n",

		hv ? mfspr(SPRN_PSSCR) : mfspr(SPRN_PSSCR_PR));