Commit d234d68e authored by Simon Guo's avatar Simon Guo Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S PR: Enable HTM for PR KVM for KVM_CHECK_EXTENSION ioctl 

With current patch set, PR KVM now supports HTM. So this patch turns it
on for PR KVM.

Tested with:
https://github.com/justdoitqd/publicFiles/blob/master/test_kvm_htm_cap.c



Signed-off-by: default avatarSimon Guo <wei.guo.simon@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 7284ca8a

arch/powerpc/kvm/powerpc.c

+2 −3
Original line number Diff line number Diff line
@@ -648,9 +648,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
#endif

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	case KVM_CAP_PPC_HTM:

		r = hv_enabled &&

		    (!!(cur_cpu_spec->cpu_user_features2 & PPC_FEATURE2_HTM) ||

		     cpu_has_feature(CPU_FTR_P9_TM_HV_ASSIST));

		r = !!(cur_cpu_spec->cpu_user_features2 & PPC_FEATURE2_HTM) ||

		     (hv_enabled && cpu_has_feature(CPU_FTR_P9_TM_HV_ASSIST));

		break;

#endif

	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE