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

Commit fd0944ba authored by Paul Mackerras's avatar Paul Mackerras Committed by Michael Ellerman
Browse files

KVM: PPC: Use ccr field in pt_regs struct embedded in vcpu struct 



When the 'regs' field was added to struct kvm_vcpu_arch, the code
was changed to use several of the fields inside regs (e.g., gpr, lr,
etc.) but not the ccr field, because the ccr field in struct pt_regs
is 64 bits on 64-bit platforms, but the cr field in kvm_vcpu_arch is
only 32 bits.  This changes the code to use the regs.ccr field
instead of cr, and changes the assembly code on 64-bit platforms to
use 64-bit loads and stores instead of 32-bit ones.

Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9a94d3ee

arch/powerpc/include/asm/kvm_book3s.h

+2 −2
Original line number Diff line number Diff line
@@ -301,12 +301,12 @@ static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num) 


static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val)

{

	vcpu->arch.cr = val;

	vcpu->arch.regs.ccr = val;

}



static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.cr;

	return vcpu->arch.regs.ccr;

}



static inline void kvmppc_set_xer(struct kvm_vcpu *vcpu, ulong val)

arch/powerpc/include/asm/kvm_book3s_64.h

+2 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static inline u64 sanitize_msr(u64 msr) 
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

static inline void copy_from_checkpoint(struct kvm_vcpu *vcpu)

{

	vcpu->arch.cr  = vcpu->arch.cr_tm;

	vcpu->arch.regs.ccr  = vcpu->arch.cr_tm;

	vcpu->arch.regs.xer = vcpu->arch.xer_tm;

	vcpu->arch.regs.link  = vcpu->arch.lr_tm;

	vcpu->arch.regs.ctr = vcpu->arch.ctr_tm;
@@ -500,7 +500,7 @@ static inline void copy_from_checkpoint(struct kvm_vcpu *vcpu) 


static inline void copy_to_checkpoint(struct kvm_vcpu *vcpu)

{

	vcpu->arch.cr_tm  = vcpu->arch.cr;

	vcpu->arch.cr_tm  = vcpu->arch.regs.ccr;

	vcpu->arch.xer_tm = vcpu->arch.regs.xer;

	vcpu->arch.lr_tm  = vcpu->arch.regs.link;

	vcpu->arch.ctr_tm = vcpu->arch.regs.ctr;

arch/powerpc/include/asm/kvm_booke.h

+2 −2
Original line number Diff line number Diff line
@@ -46,12 +46,12 @@ static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num) 


static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val)

{

	vcpu->arch.cr = val;

	vcpu->arch.regs.ccr = val;

}



static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.cr;

	return vcpu->arch.regs.ccr;

}



static inline void kvmppc_set_xer(struct kvm_vcpu *vcpu, ulong val)

arch/powerpc/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -538,8 +538,6 @@ struct kvm_vcpu_arch { 
	ulong tar;

#endif



	u32 cr;



#ifdef CONFIG_PPC_BOOK3S

	ulong hflags;

	ulong guest_owned_ext;

arch/powerpc/kernel/asm-offsets.c

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ int main(void) 
#ifdef CONFIG_PPC_BOOK3S

	OFFSET(VCPU_TAR, kvm_vcpu, arch.tar);

#endif

	OFFSET(VCPU_CR, kvm_vcpu, arch.cr);

	OFFSET(VCPU_CR, kvm_vcpu, arch.regs.ccr);

	OFFSET(VCPU_PC, kvm_vcpu, arch.regs.nip);

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	OFFSET(VCPU_MSR, kvm_vcpu, arch.shregs.msr);
@@ -695,7 +695,7 @@ int main(void) 
#endif /* CONFIG_PPC_BOOK3S_64 */



#else /* CONFIG_PPC_BOOK3S */

	OFFSET(VCPU_CR, kvm_vcpu, arch.cr);

	OFFSET(VCPU_CR, kvm_vcpu, arch.regs.ccr);

	OFFSET(VCPU_XER, kvm_vcpu, arch.regs.xer);

	OFFSET(VCPU_LR, kvm_vcpu, arch.regs.link);

	OFFSET(VCPU_CTR, kvm_vcpu, arch.regs.ctr);