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

Commit 34f754b9 authored by Bharat Bhushan's avatar Bharat Bhushan Committed by Alexander Graf
Browse files

kvm: ppc: Add SPRN_EPR get helper function 



kvmppc_set_epr() is already defined in asm/kvm_ppc.h, So
rename and move get_epr helper function to same file.

Signed-off-by: default avatarBharat Bhushan <Bharat.Bhushan@freescale.com>
[agraf: remove duplicate return]
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent c1b8a01b

arch/powerpc/include/asm/kvm_ppc.h

+11 −0
Original line number Diff line number Diff line
@@ -392,6 +392,17 @@ static inline int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd) 
	{ return 0; }

#endif



static inline unsigned long kvmppc_get_epr(struct kvm_vcpu *vcpu)

{

#ifdef CONFIG_KVM_BOOKE_HV

	return mfspr(SPRN_GEPR);

#elif defined(CONFIG_BOOKE)

	return vcpu->arch.epr;

#else

	return 0;

#endif

}



static inline void kvmppc_set_epr(struct kvm_vcpu *vcpu, u32 epr)

{

#ifdef CONFIG_KVM_BOOKE_HV

arch/powerpc/kvm/booke.c

+1 −10
Original line number Diff line number Diff line
@@ -292,15 +292,6 @@ static void set_guest_mcsrr(struct kvm_vcpu *vcpu, unsigned long srr0, u32 srr1) 
	vcpu->arch.mcsrr1 = srr1;

}



static unsigned long get_guest_epr(struct kvm_vcpu *vcpu)

{

#ifdef CONFIG_KVM_BOOKE_HV

	return mfspr(SPRN_GEPR);

#else

	return vcpu->arch.epr;

#endif

}



/* Deliver the interrupt of the corresponding priority, if possible. */

static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,

                                        unsigned int priority)
@@ -1452,7 +1443,7 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) 
		val = get_reg_val(reg->id, vcpu->arch.dbg_reg.dac2);

		break;

	case KVM_REG_PPC_EPR: {

		u32 epr = get_guest_epr(vcpu);

		u32 epr = kvmppc_get_epr(vcpu);

		val = get_reg_val(reg->id, epr);

		break;

	}