Commit 0dacc3df authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: x86: SVM: fix avic spec based definitions again 



Due to wrong rebase, commit
4a204f78 ("KVM: SVM: Allow AVIC support on system w/ physical APIC ID > 255")

moved avic spec #defines back to avic.c.

Move them back, and while at it extend AVIC_DOORBELL_PHYSICAL_ID_MASK to 12
bits as well (it will be used in nested avic)

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20220322172449.235575-5-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fe5f6914

arch/x86/include/asm/svm.h

+5 −3
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area { 




/* AVIC */

#define AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK	(0xFF)

#define AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK	(0xFFULL)

#define AVIC_LOGICAL_ID_ENTRY_VALID_BIT			31

#define AVIC_LOGICAL_ID_ENTRY_VALID_MASK		(1 << 31)
@@ -230,9 +230,11 @@ struct __attribute__ ((__packed__)) vmcb_control_area { 
#define AVIC_PHYSICAL_ID_ENTRY_BACKING_PAGE_MASK	(0xFFFFFFFFFFULL << 12)

#define AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK		(1ULL << 62)

#define AVIC_PHYSICAL_ID_ENTRY_VALID_MASK		(1ULL << 63)

#define AVIC_PHYSICAL_ID_TABLE_SIZE_MASK		(0xFF)

#define AVIC_PHYSICAL_ID_TABLE_SIZE_MASK		(0xFFULL)



#define AVIC_DOORBELL_PHYSICAL_ID_MASK			(0xFF)

#define AVIC_DOORBELL_PHYSICAL_ID_MASK			GENMASK_ULL(11, 0)



#define VMCB_AVIC_APIC_BAR_MASK				0xFFFFFFFFFF000ULL



#define AVIC_UNACCEL_ACCESS_WRITE_MASK		1

#define AVIC_UNACCEL_ACCESS_OFFSET_MASK		0xFF0

arch/x86/kvm/svm/svm.h

+0 −11
Original line number Diff line number Diff line
@@ -571,17 +571,6 @@ extern struct kvm_x86_nested_ops svm_nested_ops; 


/* avic.c */



#define AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK	(0xFF)

#define AVIC_LOGICAL_ID_ENTRY_VALID_BIT			31

#define AVIC_LOGICAL_ID_ENTRY_VALID_MASK		(1 << 31)



#define AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK	GENMASK_ULL(11, 0)

#define AVIC_PHYSICAL_ID_ENTRY_BACKING_PAGE_MASK	(0xFFFFFFFFFFULL << 12)

#define AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK		(1ULL << 62)

#define AVIC_PHYSICAL_ID_ENTRY_VALID_MASK		(1ULL << 63)



#define VMCB_AVIC_APIC_BAR_MASK		0xFFFFFFFFFF000ULL



int avic_ga_log_notifier(u32 ga_tag);

void avic_vm_destroy(struct kvm *kvm);

int avic_vm_init(struct kvm *kvm);