diff options
author | Suraj Jitindar Singh <sjitindarsingh@gmail.com> | 2018-12-14 06:29:03 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@ozlabs.org> | 2018-12-17 01:33:49 +0100 |
commit | 693ac10a88a2219bde553b2e8460dbec97e594e6 (patch) | |
tree | aa5f6625b38ca172f83453b3ebc4e224460747f8 /arch/powerpc/kvm | |
parent | KVM: PPC: Book3S HV: Flush guest mappings when turning dirty tracking on/off (diff) | |
download | linux-693ac10a88a2219bde553b2e8460dbec97e594e6.tar.xz linux-693ac10a88a2219bde553b2e8460dbec97e594e6.zip |
KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv machines
The kvm capability KVM_CAP_SPAPR_TCE_VFIO is used to indicate the
availability of in kernel tce acceleration for vfio. However it is
currently the case that this is only available on a powernv machine,
not for a pseries machine.
Thus make this capability dependent on having the cpu feature
CPU_FTR_HVMODE.
[paulus@ozlabs.org - fixed compilation for Book E.]
Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r-- | arch/powerpc/kvm/powerpc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 6a7a6a101efd..18dd98f35ac1 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -543,8 +543,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) #ifdef CONFIG_PPC_BOOK3S_64 case KVM_CAP_SPAPR_TCE: case KVM_CAP_SPAPR_TCE_64: - /* fallthrough */ + r = 1; + break; case KVM_CAP_SPAPR_TCE_VFIO: + r = !!cpu_has_feature(CPU_FTR_HVMODE); + break; case KVM_CAP_PPC_RTAS: case KVM_CAP_PPC_FIXUP_HCALL: case KVM_CAP_PPC_ENABLE_HCALL: |