KVM: PPC: e500: Add emulation helper for getting instruction ea

Add emulation helper for getting instruction ea and refactor tlb instruction
emulation to use it.

Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
[agraf: keep rt variable around]
Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 10 insertions, 4 deletions

diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index e04b0ef55ce0..e78f353a836a 100644
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -89,6 +89,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
         int ra = get_ra(inst);
         int rb = get_rb(inst);
         int rt = get_rt(inst);
+        gva_t ea;
 
         switch (get_op(inst)) {
         case 31:
@@ -113,15 +114,20 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                         break;
 
                 case XOP_TLBSX:
-                        emulated = kvmppc_e500_emul_tlbsx(vcpu,rb);
+                        ea = kvmppc_get_ea_indexed(vcpu, ra, rb);
+                        emulated = kvmppc_e500_emul_tlbsx(vcpu, ea);
                         break;
 
-                case XOP_TLBILX:
-                        emulated = kvmppc_e500_emul_tlbilx(vcpu, rt, ra, rb);
+                case XOP_TLBILX: {
+                        int type = rt & 0x3;
+                        ea = kvmppc_get_ea_indexed(vcpu, ra, rb);
+                        emulated = kvmppc_e500_emul_tlbilx(vcpu, type, ea);
                         break;
+                }
 
                 case XOP_TLBIVAX:
-                        emulated = kvmppc_e500_emul_tlbivax(vcpu, ra, rb);
+                        ea = kvmppc_get_ea_indexed(vcpu, ra, rb);
+                        emulated = kvmppc_e500_emul_tlbivax(vcpu, ea);
                         break;
 
                 default: