Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 693ac10a authored by Suraj Jitindar Singh's avatar Suraj Jitindar Singh Committed by Paul Mackerras
Browse files

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: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 5af3e9d0

arch/powerpc/kvm/powerpc.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -543,8 +543,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
#ifdef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_PPC_BOOK3S_64

	case KVM_CAP_SPAPR_TCE:

	case KVM_CAP_SPAPR_TCE:

	case KVM_CAP_SPAPR_TCE_64:

	case KVM_CAP_SPAPR_TCE_64:

		/* fallthrough */

		r = 1;

		break;

	case KVM_CAP_SPAPR_TCE_VFIO:

	case KVM_CAP_SPAPR_TCE_VFIO:

		r = !!cpu_has_feature(CPU_FTR_HVMODE);

		break;

	case KVM_CAP_PPC_RTAS:

	case KVM_CAP_PPC_RTAS:

	case KVM_CAP_PPC_FIXUP_HCALL:

	case KVM_CAP_PPC_FIXUP_HCALL:

	case KVM_CAP_PPC_ENABLE_HCALL:

	case KVM_CAP_PPC_ENABLE_HCALL: