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

Commit 5b8abf1f authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Paolo Bonzini
Browse files

kvm: svm: Do not support AVIC if not CONFIG_X86_LOCAL_APIC 



Add logic to disable AVIC #ifndef CONFIG_X86_LOCAL_APIC.

Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7d669f50

arch/x86/kvm/svm.c

+10 −5
Original line number Diff line number Diff line
@@ -238,7 +238,9 @@ module_param(nested, int, S_IRUGO); 


/* enable / disable AVIC */

static int avic;

#ifdef CONFIG_X86_LOCAL_APIC

module_param(avic, int, S_IRUGO);

#endif



static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0);

static void svm_flush_tlb(struct kvm_vcpu *vcpu);
@@ -981,11 +983,14 @@ static __init int svm_hardware_setup(void) 
	} else

		kvm_disable_tdp();



	if (avic && (!npt_enabled || !boot_cpu_has(X86_FEATURE_AVIC)))

	if (avic) {

		if (!npt_enabled ||

		    !boot_cpu_has(X86_FEATURE_AVIC) ||

		    !IS_ENABLED(CONFIG_X86_LOCAL_APIC))

			avic = false;



	if (avic)

		else

			pr_info("AVIC enabled\n");

	}



	return 0;