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

Commit 173c520a authored by Simon Guo's avatar Simon Guo Committed by Paul Mackerras
Browse files

KVM: PPC: Move nip/ctr/lr/xer registers to pt_regs in kvm_vcpu_arch 



This patch moves nip/ctr/lr/xer registers from scattered places in
kvm_vcpu_arch to pt_regs structure.

cr register is "unsigned long" in pt_regs and u32 in vcpu->arch.
It will need more consideration and may move in later patches.

Signed-off-by: default avatarSimon Guo <wei.guo.simon@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 1143a706

arch/powerpc/include/asm/kvm_book3s.h

+8 −8
Original line number Diff line number Diff line
@@ -295,42 +295,42 @@ static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu) 


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

{

	vcpu->arch.xer = val;

	vcpu->arch.regs.xer = val;

}



static inline ulong kvmppc_get_xer(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.xer;

	return vcpu->arch.regs.xer;

}



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

{

	vcpu->arch.ctr = val;

	vcpu->arch.regs.ctr = val;

}



static inline ulong kvmppc_get_ctr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.ctr;

	return vcpu->arch.regs.ctr;

}



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

{

	vcpu->arch.lr = val;

	vcpu->arch.regs.link = val;

}



static inline ulong kvmppc_get_lr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.lr;

	return vcpu->arch.regs.link;

}



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

{

	vcpu->arch.pc = val;

	vcpu->arch.regs.nip = val;

}



static inline ulong kvmppc_get_pc(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.pc;

	return vcpu->arch.regs.nip;

}



static inline u64 kvmppc_get_msr(struct kvm_vcpu *vcpu);

arch/powerpc/include/asm/kvm_book3s_64.h

+6 −6
Original line number Diff line number Diff line
@@ -483,9 +483,9 @@ static inline u64 sanitize_msr(u64 msr) 
static inline void copy_from_checkpoint(struct kvm_vcpu *vcpu)

{

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

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

	vcpu->arch.lr  = vcpu->arch.lr_tm;

	vcpu->arch.ctr = vcpu->arch.ctr_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;

	vcpu->arch.amr = vcpu->arch.amr_tm;

	vcpu->arch.ppr = vcpu->arch.ppr_tm;

	vcpu->arch.dscr = vcpu->arch.dscr_tm;
@@ -500,9 +500,9 @@ 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.xer_tm = vcpu->arch.xer;

	vcpu->arch.lr_tm  = vcpu->arch.lr;

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

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

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

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

	vcpu->arch.amr_tm = vcpu->arch.amr;

	vcpu->arch.ppr_tm = vcpu->arch.ppr;

	vcpu->arch.dscr_tm = vcpu->arch.dscr;

arch/powerpc/include/asm/kvm_booke.h

+8 −8
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu) 


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

{

	vcpu->arch.xer = val;

	vcpu->arch.regs.xer = val;

}



static inline ulong kvmppc_get_xer(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.xer;

	return vcpu->arch.regs.xer;

}



static inline bool kvmppc_need_byteswap(struct kvm_vcpu *vcpu)
@@ -72,32 +72,32 @@ static inline bool kvmppc_need_byteswap(struct kvm_vcpu *vcpu) 


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

{

	vcpu->arch.ctr = val;

	vcpu->arch.regs.ctr = val;

}



static inline ulong kvmppc_get_ctr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.ctr;

	return vcpu->arch.regs.ctr;

}



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

{

	vcpu->arch.lr = val;

	vcpu->arch.regs.link = val;

}



static inline ulong kvmppc_get_lr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.lr;

	return vcpu->arch.regs.link;

}



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

{

	vcpu->arch.pc = val;

	vcpu->arch.regs.nip = val;

}



static inline ulong kvmppc_get_pc(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.pc;

	return vcpu->arch.regs.nip;

}



static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu)

arch/powerpc/include/asm/kvm_host.h

+0 −4
Original line number Diff line number Diff line
@@ -521,14 +521,10 @@ struct kvm_vcpu_arch { 
	u32 qpr[32];

#endif



	ulong pc;

	ulong ctr;

	ulong lr;

#ifdef CONFIG_PPC_BOOK3S

	ulong tar;

#endif



	ulong xer;

	u32 cr;



#ifdef CONFIG_PPC_BOOK3S

arch/powerpc/kernel/asm-offsets.c

+8 −8
Original line number Diff line number Diff line
@@ -431,14 +431,14 @@ int main(void) 
#ifdef CONFIG_ALTIVEC

	OFFSET(VCPU_VRS, kvm_vcpu, arch.vr.vr);

#endif

	OFFSET(VCPU_XER, kvm_vcpu, arch.xer);

	OFFSET(VCPU_CTR, kvm_vcpu, arch.ctr);

	OFFSET(VCPU_LR, kvm_vcpu, arch.lr);

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

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

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

#ifdef CONFIG_PPC_BOOK3S

	OFFSET(VCPU_TAR, kvm_vcpu, arch.tar);

#endif

	OFFSET(VCPU_CR, kvm_vcpu, arch.cr);

	OFFSET(VCPU_PC, kvm_vcpu, arch.pc);

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

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

	OFFSET(VCPU_MSR, kvm_vcpu, arch.shregs.msr);

	OFFSET(VCPU_SRR0, kvm_vcpu, arch.shregs.srr0);
@@ -695,10 +695,10 @@ int main(void) 


#else /* CONFIG_PPC_BOOK3S */

	OFFSET(VCPU_CR, kvm_vcpu, arch.cr);

	OFFSET(VCPU_XER, kvm_vcpu, arch.xer);

	OFFSET(VCPU_LR, kvm_vcpu, arch.lr);

	OFFSET(VCPU_CTR, kvm_vcpu, arch.ctr);

	OFFSET(VCPU_PC, kvm_vcpu, arch.pc);

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

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

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

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

	OFFSET(VCPU_SPRG9, kvm_vcpu, arch.sprg9);

	OFFSET(VCPU_LAST_INST, kvm_vcpu, arch.last_inst);

	OFFSET(VCPU_FAULT_DEAR, kvm_vcpu, arch.fault_dear);