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

Commit 35c2405e authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S HV: Make xive_pushed a byte, not a word 



Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 2662efd0

arch/powerpc/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ struct kvm_vcpu_arch { 
	struct kvmppc_icp *icp; /* XICS presentation controller */

	struct kvmppc_xive_vcpu *xive_vcpu; /* XIVE virtual CPU data */

	__be32 xive_cam_word;    /* Cooked W2 in proper endian with valid bit */

	u32 xive_pushed;	 /* Is the VP pushed on the physical CPU ? */

	u8 xive_pushed;		 /* Is the VP pushed on the physical CPU ? */

	union xive_tma_w01 xive_saved_state; /* W0..1 of XIVE thread state */

#endif

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+3 −3
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300) 
	li	r9, TM_QW1_OS + TM_WORD2

	stwcix	r11,r9,r10

	li	r9, 1

	stw	r9, VCPU_XIVE_PUSHED(r4)

	stb	r9, VCPU_XIVE_PUSHED(r4)

	eieio



	/*
@@ -1458,7 +1458,7 @@ mc_cont: 
#endif

#ifdef CONFIG_KVM_XICS

	/* We are exiting, pull the VP from the XIVE */

	lwz	r0, VCPU_XIVE_PUSHED(r9)

	lbz	r0, VCPU_XIVE_PUSHED(r9)

	cmpwi	cr0, r0, 0

	beq	1f

	li	r7, TM_SPC_PULL_OS_CTX
@@ -1487,7 +1487,7 @@ mc_cont: 
	/* Fixup some of the state for the next load */

	li	r10, 0

	li	r0, 0xff

	stw	r10, VCPU_XIVE_PUSHED(r9)

	stb	r10, VCPU_XIVE_PUSHED(r9)

	stb	r10, (VCPU_XIVE_SAVED_STATE+3)(r9)

	stb	r0, (VCPU_XIVE_SAVED_STATE+4)(r9)

	eieio