KVM: PPC: 440: Implement mtdcrx

We need mtdcrx to execute properly on 460 cores.

Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 23 insertions, 13 deletions

diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
index c8c61578fdfc..3843a75e3e98 100644
--- a/arch/powerpc/kvm/44x_emulate.c
+++ b/arch/powerpc/kvm/44x_emulate.c
@@ -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);
-                                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;
-                        }
+                        emulated = emulate_mtdcr(vcpu, rs, dcrn);
+                        break;
 
+                case XOP_MTDCRX:
+                        emulated = emulate_mtdcr(vcpu, rs,
+                                        kvmppc_get_gpr(vcpu, ra));
                         break;
 
                 case XOP_TLBWE: