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

Commit e4dcfe88 authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: PPC: 440: Implement mtdcrx 



We need mtdcrx to execute properly on 460 cores.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 2e232702

arch/powerpc/kvm/44x_emulate.c

+23 −13
Original line number Diff line number Diff line
@@ -28,11 +28,29 @@ 
#include "44x_tlb.h"



#define XOP_MFDCR   323

#define XOP_MTDCRX  387

#define XOP_MTDCR   451

#define XOP_TLBSX   914

#define XOP_ICCCI   966

#define XOP_TLBWE   978



static int emulate_mtdcr(struct kvm_vcpu *vcpu, int rs, int dcrn)

{

	/* emulate some access in kernel */

	switch (dcrn) {

	case DCRN_CPR0_CONFIG_ADDR:

		vcpu->arch.cpr0_cfgaddr = kvmppc_get_gpr(vcpu, rs);

		return EMULATE_DONE;

	default:

		vcpu->run->dcr.dcrn = dcrn;

		vcpu->run->dcr.data = kvmppc_get_gpr(vcpu, rs);

		vcpu->run->dcr.is_write = 1;

		vcpu->arch.dcr_needed = 1;

		kvmppc_account_exit(vcpu, DCR_EXITS);

		return EMULATE_DO_DCR;

	}

}



int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,

                           unsigned int inst, int *advance)

{
@@ -85,20 +103,12 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			break;



		case XOP_MTDCR:

			/* emulate some access in kernel */

			switch (dcrn) {

			case DCRN_CPR0_CONFIG_ADDR:

				vcpu->arch.cpr0_cfgaddr = kvmppc_get_gpr(vcpu, rs);

			emulated = emulate_mtdcr(vcpu, rs, dcrn);

			break;

			default:

				run->dcr.dcrn = dcrn;

				run->dcr.data = kvmppc_get_gpr(vcpu, rs);

				run->dcr.is_write = 1;

				vcpu->arch.dcr_needed = 1;

				kvmppc_account_exit(vcpu, DCR_EXITS);

				emulated = EMULATE_DO_DCR;

			}



		case XOP_MTDCRX:

			emulated = emulate_mtdcr(vcpu, rs,

					kvmppc_get_gpr(vcpu, ra));

			break;



		case XOP_TLBWE: