1 files changed, 32 insertions, 2 deletions

diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 105b6918b23e..78133deb4b64 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -20,7 +20,6 @@ config KVM
         bool
         select PREEMPT_NOTIFIERS
         select ANON_INODES
-        select KVM_MMIO
 
 config KVM_BOOK3S_HANDLER
         bool
@@ -28,16 +27,22 @@ config KVM_BOOK3S_HANDLER
 config KVM_BOOK3S_32_HANDLER
         bool
         select KVM_BOOK3S_HANDLER
+        select KVM_MMIO
 
 config KVM_BOOK3S_64_HANDLER
         bool
         select KVM_BOOK3S_HANDLER
 
+config KVM_BOOK3S_PR
+        bool
+        select KVM_MMIO
+
 config KVM_BOOK3S_32
         tristate "KVM support for PowerPC book3s_32 processors"
         depends on EXPERIMENTAL && PPC_BOOK3S_32 && !SMP && !PTE_64BIT
         select KVM
         select KVM_BOOK3S_32_HANDLER
+        select KVM_BOOK3S_PR
         ---help---
           Support running unmodified book3s_32 guest kernels
           in virtual machines on book3s_32 host processors.
@@ -50,8 +55,8 @@ config KVM_BOOK3S_32
 config KVM_BOOK3S_64
         tristate "KVM support for PowerPC book3s_64 processors"
         depends on EXPERIMENTAL && PPC_BOOK3S_64
-        select KVM
         select KVM_BOOK3S_64_HANDLER
+        select KVM
         ---help---
           Support running unmodified book3s_64 and book3s_32 guest kernels
           in virtual machines on book3s_64 host processors.
@@ -61,10 +66,34 @@ config KVM_BOOK3S_64
 
           If unsure, say N.
 
+config KVM_BOOK3S_64_HV
+        bool "KVM support for POWER7 and PPC970 using hypervisor mode in host"
+        depends on KVM_BOOK3S_64
+        ---help---
+          Support running unmodified book3s_64 guest kernels in
+          virtual machines on POWER7 and PPC970 processors that have
+          hypervisor mode available to the host.
+
+          If you say Y here, KVM will use the hardware virtualization
+          facilities of POWER7 (and later) processors, meaning that
+          guest operating systems will run at full hardware speed
+          using supervisor and user modes.  However, this also means
+          that KVM is not usable under PowerVM (pHyp), is only usable
+          on POWER7 (or later) processors and PPC970-family processors,
+          and cannot emulate a different processor from the host processor.
+
+          If unsure, say N.
+
+config KVM_BOOK3S_64_PR
+        def_bool y
+        depends on KVM_BOOK3S_64 && !KVM_BOOK3S_64_HV
+        select KVM_BOOK3S_PR
+
 config KVM_440
         bool "KVM support for PowerPC 440 processors"
         depends on EXPERIMENTAL && 44x
         select KVM
+        select KVM_MMIO
         ---help---
           Support running unmodified 440 guest kernels in virtual machines on
           440 host processors.
@@ -89,6 +118,7 @@ config KVM_E500
         bool "KVM support for PowerPC E500 processors"
         depends on EXPERIMENTAL && E500
         select KVM
+        select KVM_MMIO
         ---help---
           Support running unmodified E500 guest kernels in virtual machines on
           E500 host processors.