Commit 3d7181f6 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by PvsNarasimha
Browse files

x86/apic: Cleanup destination mode 

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

Reference: https://github.com/torvalds/linux/commit/8c44963b603db76e3e5f57d90d027657ba43c1fe



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

commit 8c44963b upstream

apic::irq_dest_mode is actually a boolean, but defined as u32 and named in
a way which does not explain what it means.

Make it a boolean and rename it to 'dest_mode_logical'

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-9-dwmw2@infradead.org


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

arch/x86/include/asm/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ struct apic { 
	u32	disable_esr;



	enum apic_delivery_modes delivery_mode;

	u32	irq_dest_mode;

	bool	dest_mode_logical;



	u32	(*calc_dest_apicid)(unsigned int cpu);

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1594,7 +1594,7 @@ static void setup_local_APIC(void) 
	apic->init_apic_ldr();



#ifdef CONFIG_X86_32

	if (apic->irq_dest_mode == 1) {

	if (apic->dest_mode_logical) {

		int logical_apicid, ldr_apicid;



		/*

arch/x86/kernel/apic/apic_flat_64.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static struct apic apic_flat __ro_after_init = { 
	.apic_id_registered		= flat_apic_id_registered,



	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.irq_dest_mode			= 1, /* logical */

	.dest_mode_logical		= true,



	.disable_esr			= 0,
@@ -205,7 +205,7 @@ static struct apic apic_physflat __ro_after_init = { 
	.apic_id_registered		= flat_apic_id_registered,



	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.irq_dest_mode			= 0, /* physical */

	.dest_mode_logical		= false,



	.disable_esr			= 0,

arch/x86/kernel/apic/apic_noop.c

+1 −3
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ struct apic apic_noop __ro_after_init = { 
	.apic_id_registered		= noop_apic_id_registered,



	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	/* logical delivery broadcast to all CPUs: */

	.irq_dest_mode			= 1,

	.dest_mode_logical		= true,



	.disable_esr			= 0,
@@ -105,7 +104,6 @@ struct apic apic_noop __ro_after_init = { 
	.init_apic_ldr			= noop_init_apic_ldr,

	.ioapic_phys_id_map		= default_ioapic_phys_id_map,

	.setup_apic_routing		= NULL,



	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= physid_set_mask_of_physid,

arch/x86/kernel/apic/apic_numachip.c

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static const struct apic apic_numachip1 __refconst = { 
	.apic_id_registered		= numachip_apic_id_registered,



	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.irq_dest_mode			= 0, /* physical */

	.dest_mode_logical		= false,



	.disable_esr			= 0,
@@ -294,7 +294,7 @@ static const struct apic apic_numachip2 __refconst = { 
	.apic_id_registered		= numachip_apic_id_registered,



	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.irq_dest_mode			= 0, /* physical */

	.dest_mode_logical		= false,



	.disable_esr			= 0,