Commit b5a5ce58 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Dave Hansen
Browse files

x86/apic: Prepare x2APIC for using apic::max_apic_id 



In order to remove the apic::apic_id_valid() callback and switch to
checking apic::max_apic_id, it is required to update apic::max_apic_id when
the APIC initialization code overrides it via x2apic_set_max_apicid().

Make the existing booleans a bitfield and add a flag which lets the update
function and the core code which switches the driver detect whether the
apic instance wants to have that update or not and apply it if required.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
parent a9d608c2

arch/x86/include/asm/apic.h

+4 −3
Original line number Diff line number Diff line
@@ -266,10 +266,11 @@ struct apic { 
	void	(*send_IPI_all)(int vector);

	void	(*send_IPI_self)(int vector);



	u32	disable_esr;



	enum apic_delivery_modes delivery_mode;

	bool	dest_mode_logical;



	u32	disable_esr		: 1,

		dest_mode_logical	: 1,

		x2apic_set_max_apicid	: 1;



	u32	(*calc_dest_apicid)(unsigned int cpu);

arch/x86/kernel/apic/local.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ int x2apic_phys_pkg_id(int initial_apicid, int index_msb); 
void x2apic_send_IPI_all(int vector);

void x2apic_send_IPI_allbutself(int vector);

void x2apic_send_IPI_self(int vector);

extern u32 x2apic_max_apicid;



/* IPI */

arch/x86/kernel/apic/probe_64.c

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ static __init void apic_install_driver(struct apic *driver) 
		return;



	apic = driver;



	if (IS_ENABLED(CONFIG_X86_X2APIC) && apic->x2apic_set_max_apicid)

		apic->max_apic_id = x2apic_max_apicid;



	pr_info("Switched APIC routing to %s:\n", apic->name);

}

arch/x86/kernel/apic/x2apic_cluster.c

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ static struct apic apic_x2apic_cluster __ro_after_init = { 
	.phys_pkg_id			= x2apic_phys_pkg_id,



	.max_apic_id			= UINT_MAX,

	.x2apic_set_max_apicid		= true,

	.get_apic_id			= x2apic_get_apic_id,

	.set_apic_id			= x2apic_set_apic_id,

arch/x86/kernel/apic/x2apic_phys.c

+4 −1
Original line number Diff line number Diff line
@@ -8,11 +8,13 @@ 
int x2apic_phys;



static struct apic apic_x2apic_phys;

static u32 x2apic_max_apicid __ro_after_init = UINT_MAX;

u32 x2apic_max_apicid __ro_after_init = UINT_MAX;



void __init x2apic_set_max_apicid(u32 apicid)

{

	x2apic_max_apicid = apicid;

	if (apic->x2apic_set_max_apicid)

		apic->max_apic_id = apicid;

}



static int __init set_x2apic_phys_mode(char *arg)
@@ -161,6 +163,7 @@ static struct apic apic_x2apic_phys __ro_after_init = { 
	.phys_pkg_id			= x2apic_phys_pkg_id,



	.max_apic_id			= UINT_MAX,

	.x2apic_set_max_apicid		= true,

	.get_apic_id			= x2apic_get_apic_id,

	.set_apic_id			= x2apic_set_apic_id,