Commit d1290b15 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity

KVM: PPC: PV tlbsync to nop

With our current MMU scheme we don't need to know about the tlbsync instruction.
So we can just nop it out.
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d1293c92
...@@ -62,6 +62,8 @@ ...@@ -62,6 +62,8 @@
#define KVM_INST_MTSPR_DAR 0x7c1303a6 #define KVM_INST_MTSPR_DAR 0x7c1303a6
#define KVM_INST_MTSPR_DSISR 0x7c1203a6 #define KVM_INST_MTSPR_DSISR 0x7c1203a6
#define KVM_INST_TLBSYNC 0x7c00046c
static bool kvm_patching_worked = true; static bool kvm_patching_worked = true;
static inline void kvm_patch_ins(u32 *inst, u32 new_inst) static inline void kvm_patch_ins(u32 *inst, u32 new_inst)
...@@ -98,6 +100,11 @@ static void kvm_patch_ins_stw(u32 *inst, long addr, u32 rt) ...@@ -98,6 +100,11 @@ static void kvm_patch_ins_stw(u32 *inst, long addr, u32 rt)
kvm_patch_ins(inst, KVM_INST_STW | rt | (addr & 0x0000fffc)); kvm_patch_ins(inst, KVM_INST_STW | rt | (addr & 0x0000fffc));
} }
static void kvm_patch_ins_nop(u32 *inst)
{
kvm_patch_ins(inst, KVM_INST_NOP);
}
static void kvm_map_magic_page(void *data) static void kvm_map_magic_page(void *data)
{ {
kvm_hypercall2(KVM_HC_PPC_MAP_MAGIC_PAGE, kvm_hypercall2(KVM_HC_PPC_MAP_MAGIC_PAGE,
...@@ -166,6 +173,11 @@ static void kvm_check_ins(u32 *inst) ...@@ -166,6 +173,11 @@ static void kvm_check_ins(u32 *inst)
case KVM_INST_MTSPR_DSISR: case KVM_INST_MTSPR_DSISR:
kvm_patch_ins_stw(inst, magic_var(dsisr), inst_rt); kvm_patch_ins_stw(inst, magic_var(dsisr), inst_rt);
break; break;
/* Nops */
case KVM_INST_TLBSYNC:
kvm_patch_ins_nop(inst);
break;
} }
switch (_inst) { switch (_inst) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment