diff options
author | Paul Mackerras <paulus@samba.org> | 2014-12-02 21:30:38 -0500 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2014-12-17 07:44:03 -0500 |
commit | c17b98cf6028704e1f953d6a25ed6140425ccfd0 (patch) | |
tree | 6ff4f87501da667d0ca842afe535ba5615ce9ebe /arch/powerpc/kvm/powerpc.c | |
parent | 3c78f78af95615b017be751e763e623b6252d166 (diff) |
KVM: PPC: Book3S HV: Remove code for PPC970 processors
This removes the code that was added to enable HV KVM to work
on PPC970 processors. The PPC970 is an old CPU that doesn't
support virtualizing guest memory. Removing PPC970 support also
lets us remove the code for allocating and managing contiguous
real-mode areas, the code for the !kvm->arch.using_mmu_notifiers
case, the code for pinning pages of guest memory when first
accessed and keeping track of which pages have been pinned, and
the code for handling H_ENTER hypercalls in virtual mode.
Book3S HV KVM is now supported only on POWER7 and POWER8 processors.
The KVM_CAP_PPC_RMA capability now always returns 0.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm/powerpc.c')
-rw-r--r-- | arch/powerpc/kvm/powerpc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index c1f8f53cd312..c45eaab752b0 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c | |||
@@ -527,18 +527,12 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) | |||
527 | r = 0; | 527 | r = 0; |
528 | break; | 528 | break; |
529 | case KVM_CAP_PPC_RMA: | 529 | case KVM_CAP_PPC_RMA: |
530 | r = hv_enabled; | 530 | r = 0; |
531 | /* PPC970 requires an RMA */ | ||
532 | if (r && cpu_has_feature(CPU_FTR_ARCH_201)) | ||
533 | r = 2; | ||
534 | break; | 531 | break; |
535 | #endif | 532 | #endif |
536 | case KVM_CAP_SYNC_MMU: | 533 | case KVM_CAP_SYNC_MMU: |
537 | #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE | 534 | #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE |
538 | if (hv_enabled) | 535 | r = hv_enabled; |
539 | r = cpu_has_feature(CPU_FTR_ARCH_206) ? 1 : 0; | ||
540 | else | ||
541 | r = 0; | ||
542 | #elif defined(KVM_ARCH_WANT_MMU_NOTIFIER) | 536 | #elif defined(KVM_ARCH_WANT_MMU_NOTIFIER) |
543 | r = 1; | 537 | r = 1; |
544 | #else | 538 | #else |