diff options
| author | Alexander Graf <agraf@suse.de> | 2014-06-20 14:43:36 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-07-28 16:35:53 +0200 |
| commit | c12fb43c2f6d6a57a4e21afe74ff56485d699ee7 (patch) | |
| tree | 4e5b0697bebd43348fa15f116b1c746ef561a9cb /arch/powerpc/include | |
| parent | c45c551403f0a7b152e56c53735b954faa36c54c (diff) | |
| download | blackbird-obmc-linux-c12fb43c2f6d6a57a4e21afe74ff56485d699ee7.tar.gz blackbird-obmc-linux-c12fb43c2f6d6a57a4e21afe74ff56485d699ee7.zip | |
KVM: PPC: Handle magic page in kvmppc_ld/st
We use kvmppc_ld and kvmppc_st to emulate load/store instructions that may as
well access the magic page. Special case it out so that we can properly access
it.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_book3s.h | 7 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/kvm_booke.h | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index 172fd6dd2821..61667913ec98 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -286,6 +286,13 @@ static inline bool is_kvmppc_resume_guest(int r) return (r == RESUME_GUEST || r == RESUME_GUEST_NV); } +static inline bool is_kvmppc_hv_enabled(struct kvm *kvm); +static inline bool kvmppc_supports_magic_page(struct kvm_vcpu *vcpu) +{ + /* Only PR KVM supports the magic page */ + return !is_kvmppc_hv_enabled(vcpu->kvm); +} + /* Magic register values loaded into r3 and r4 before the 'sc' assembly * instruction for the OSI hypercalls */ #define OSI_SC_MAGIC_R3 0x113724FA diff --git a/arch/powerpc/include/asm/kvm_booke.h b/arch/powerpc/include/asm/kvm_booke.h index cbb19906ca36..f7aa5cc395c4 100644 --- a/arch/powerpc/include/asm/kvm_booke.h +++ b/arch/powerpc/include/asm/kvm_booke.h @@ -103,4 +103,14 @@ static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu) { return vcpu->arch.fault_dear; } + +static inline bool kvmppc_supports_magic_page(struct kvm_vcpu *vcpu) +{ + /* Magic page is only supported on e500v2 */ +#ifdef CONFIG_KVM_E500V2 + return true; +#else + return false; +#endif +} #endif /* __ASM_KVM_BOOKE_H__ */ |
