Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 15:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx

Browse Source 
The exit type setting for mfspr/mtspr is moved from 44x to toplevel SPR
emulation.  This enables it on e500, and makes sure that all SPRs
are covered.

Exit accounting for tlbwe and tlbsx is added to e500.

Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Scott Wood 2011-03-28 15:01:24 -05:00 committed by Avi Kivity
parent 90d34b0e45
commit 49ea06957b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kvm/44x_emulate.c
View File

@ -158,7 +158,6 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, rs); emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, rs);
} }
kvmppc_set_exit_type(vcpu, EMULATED_MTSPR_EXITS);
return emulated; return emulated;
} }
@ -179,7 +178,6 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, rt); emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, rt);
} }
kvmppc_set_exit_type(vcpu, EMULATED_MFSPR_EXITS);
return emulated; return emulated;
} }

5
arch/powerpc/kvm/e500_tlb.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved. * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved.
* *
* Author: Yu Liu, yu.liu@freescale.com * Author: Yu Liu, yu.liu@freescale.com
* *
@ -24,6 +24,7 @@
#include "../mm/mmu_decl.h" #include "../mm/mmu_decl.h"
#include "e500_tlb.h" #include "e500_tlb.h"
#include "trace.h" #include "trace.h"
#include "timing.h"
#define to_htlb1_esel(esel) (tlb1_entry_num - (esel) - 1) #define to_htlb1_esel(esel) (tlb1_entry_num - (esel) - 1)
@ -506,6 +507,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb)
vcpu_e500->mas7 = 0; vcpu_e500->mas7 = 0;
} }
kvmppc_set_exit_type(vcpu, EMULATED_TLBSX_EXITS);
return EMULATE_DONE; return EMULATE_DONE;
} }
@ -571,6 +573,7 @@ int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *vcpu)
write_host_tlbe(vcpu_e500, stlbsel, sesel); write_host_tlbe(vcpu_e500, stlbsel, sesel);
} }
kvmppc_set_exit_type(vcpu, EMULATED_TLBWE_EXITS);
return EMULATE_DONE; return EMULATE_DONE;
} }

2
arch/powerpc/kvm/emulate.c
View File

@ -294,6 +294,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
} }
break; break;
} }
kvmppc_set_exit_type(vcpu, EMULATED_MFSPR_EXITS);
break; break;
case OP_31_XOP_STHX: case OP_31_XOP_STHX:
@ -363,6 +364,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
printk("mtspr: unknown spr %x\n", sprn); printk("mtspr: unknown spr %x\n", sprn);
break; break;
} }
kvmppc_set_exit_type(vcpu, EMULATED_MTSPR_EXITS);
break; break;
case OP_31_XOP_DCBI: case OP_31_XOP_DCBI: