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

KVM: x86: lapic: Rename [GET/SET]_APIC_DEST_FIELD to [GET/SET]_XAPIC_DEST_FIELD 



To signify that the macros only support 8-bit xAPIC destination ID.

Suggested-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: default avatarPankaj Gupta <pankaj.gupta@amd.com>
Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220519102709.24125-3-suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent aae99a7c

arch/x86/hyperv/hv_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static void hv_apic_icr_write(u32 low, u32 id) 
{

	u64 reg_val;



	reg_val = SET_APIC_DEST_FIELD(id);

	reg_val = SET_XAPIC_DEST_FIELD(id);

	reg_val = reg_val << 32;

	reg_val |= low;

arch/x86/include/asm/apicdef.h

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ 
#define		APIC_DM_EXTINT		0x00700

#define		APIC_VECTOR_MASK	0x000FF

#define	APIC_ICR2	0x310

#define		GET_APIC_DEST_FIELD(x)	(((x) >> 24) & 0xFF)

#define		SET_APIC_DEST_FIELD(x)	((x) << 24)

#define		GET_XAPIC_DEST_FIELD(x)	(((x) >> 24) & 0xFF)

#define		SET_XAPIC_DEST_FIELD(x)	((x) << 24)

#define	APIC_LVTT	0x320

#define	APIC_LVTTHMR	0x330

#define	APIC_LVTPC	0x340

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ void native_apic_icr_write(u32 low, u32 id) 
	unsigned long flags;



	local_irq_save(flags);

	apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));

	apic_write(APIC_ICR2, SET_XAPIC_DEST_FIELD(id));

	apic_write(APIC_ICR, low);

	local_irq_restore(flags);

}

arch/x86/kernel/apic/ipi.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ void native_send_call_func_ipi(const struct cpumask *mask) 


static inline int __prepare_ICR2(unsigned int mask)

{

	return SET_APIC_DEST_FIELD(mask);

	return SET_XAPIC_DEST_FIELD(mask);

}



static inline void __xapic_wait_icr_idle(void)

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ void kvm_apic_send_ipi(struct kvm_lapic *apic, u32 icr_low, u32 icr_high) 
	if (apic_x2apic_mode(apic))

		irq.dest_id = icr_high;

	else

		irq.dest_id = GET_APIC_DEST_FIELD(icr_high);

		irq.dest_id = GET_XAPIC_DEST_FIELD(icr_high);



	trace_kvm_apic_ipi(icr_low, irq.dest_id);