Commit 15259e4a authored by Thomas Gleixner's avatar Thomas Gleixner Committed by PvsNarasimha
Browse files

x86/apic: Cleanup delivery mode defines 

mainline inclusion
from mainline-v5.11-rc1
commit 72161299
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/721612994f53ed600b39a80d912b10f51960e2e3



--------------------------------

commit 72161299 upstream

The enum ioapic_irq_destination_types and the enumerated constants starting
with 'dest_' are gross misnomers because they describe the delivery mode.

Rename then enum and the constants so they actually make sense.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201024213535.443185-6-dwmw2@infradead.org


Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent 5e709c75

arch/x86/include/asm/apic.h

+2 −1
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ struct apic { 
	/* dest_logical is used by the IPI functions */

	u32	dest_logical;

	u32	disable_esr;

	u32	irq_delivery_mode;



	enum apic_delivery_modes delivery_mode;

	u32	irq_dest_mode;



	u32	(*calc_dest_apicid)(unsigned int cpu);

arch/x86/include/asm/apicdef.h

+7 −9
Original line number Diff line number Diff line
@@ -432,15 +432,13 @@ struct local_apic { 
 #define BAD_APICID 0xFFFFu

#endif



enum ioapic_irq_destination_types {

	dest_Fixed		= 0,

	dest_LowestPrio		= 1,

	dest_SMI		= 2,

	dest__reserved_1	= 3,

	dest_NMI		= 4,

	dest_INIT		= 5,

	dest__reserved_2	= 6,

	dest_ExtINT		= 7

enum apic_delivery_modes {

	APIC_DELIVERY_MODE_FIXED	= 0,

	APIC_DELIVERY_MODE_LOWESTPRIO   = 1,

	APIC_DELIVERY_MODE_SMI		= 2,

	APIC_DELIVERY_MODE_NMI		= 4,

	APIC_DELIVERY_MODE_INIT		= 5,

	APIC_DELIVERY_MODE_EXTINT	= 7,

};



#endif /* _ASM_X86_APICDEF_H */

arch/x86/kernel/apic/apic_flat_64.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static struct apic apic_flat __ro_after_init = { 
	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= flat_apic_id_registered,



	.irq_delivery_mode		= dest_Fixed,

	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.irq_dest_mode			= 1, /* logical */



	.disable_esr			= 0,
@@ -206,7 +206,7 @@ static struct apic apic_physflat __ro_after_init = { 
	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= flat_apic_id_registered,



	.irq_delivery_mode		= dest_Fixed,

	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.irq_dest_mode			= 0, /* physical */



	.disable_esr			= 0,

arch/x86/kernel/apic/apic_noop.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct apic apic_noop __ro_after_init = { 
	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= noop_apic_id_registered,



	.irq_delivery_mode		= dest_Fixed,

	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	/* logical delivery broadcast to all CPUs: */

	.irq_dest_mode			= 1,

arch/x86/kernel/apic/apic_numachip.c

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static const struct apic apic_numachip1 __refconst = { 
	.apic_id_valid			= numachip_apic_id_valid,

	.apic_id_registered		= numachip_apic_id_registered,



	.irq_delivery_mode		= dest_Fixed,

	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.irq_dest_mode			= 0, /* physical */



	.disable_esr			= 0,
@@ -295,7 +295,7 @@ static const struct apic apic_numachip2 __refconst = { 
	.apic_id_valid			= numachip_apic_id_valid,

	.apic_id_registered		= numachip_apic_id_registered,



	.irq_delivery_mode		= dest_Fixed,

	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.irq_dest_mode			= 0, /* physical */



	.disable_esr			= 0,