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

x86/apic: Mop up apic::apic_id_registered() 



Really not a hotpath and again no reason for having a gazillion of empty
callbacks returning 1. Make it return bool and provide one shared
implementation for the remaining users.

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 9d87f5b6

arch/x86/include/asm/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ struct apic { 
	int	(*probe)(void);

	int	(*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);

	int	(*apic_id_valid)(u32 apicid);

	int	(*apic_id_registered)(void);

	bool	(*apic_id_registered)(void);



	bool	(*check_apicid_used)(physid_mask_t *map, int apicid);

	void	(*init_apic_ldr)(void);

arch/x86/kernel/apic/apic.c

+2 −5
Original line number Diff line number Diff line
@@ -1571,11 +1571,8 @@ static void setup_local_APIC(void) 
		apic_write(APIC_ESR, 0);

	}

#endif

	/*

	 * Double-check whether this APIC is really registered.

	 * This is meaningless in clustered apic mode, so we skip it.

	 */

	BUG_ON(!apic->apic_id_registered());

	/* Validate that the APIC is registered if required */

	BUG_ON(apic->apic_id_registered && !apic->apic_id_registered());



	/*

	 * Intel recommends to set DFR, LDR and TPR before enabling

arch/x86/kernel/apic/apic_common.c

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ int default_apic_id_valid(u32 apicid) 
	return (apicid < 255);

}



bool default_apic_id_registered(void)

{

	return physid_isset(read_apic_id(), phys_cpu_present_map);

}



/*

 * Set up the logical destination ID when the APIC operates in logical

 * destination mode.

arch/x86/kernel/apic/apic_flat_64.c

+2 −12
Original line number Diff line number Diff line
@@ -66,16 +66,6 @@ static u32 set_apic_id(unsigned int id) 
	return (id & 0xFF) << 24;

}



static unsigned int read_xapic_id(void)

{

	return flat_get_apic_id(apic_read(APIC_ID));

}



static int flat_apic_id_registered(void)

{

	return physid_isset(read_xapic_id(), phys_cpu_present_map);

}



static int flat_phys_pkg_id(int initial_apic_id, int index_msb)

{

	return initial_apic_id >> index_msb;
@@ -91,7 +81,7 @@ static struct apic apic_flat __ro_after_init = { 
	.probe				= flat_probe,

	.acpi_madt_oem_check		= flat_acpi_madt_oem_check,

	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= flat_apic_id_registered,

	.apic_id_registered		= default_apic_id_registered,



	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.dest_mode_logical		= true,
@@ -168,7 +158,7 @@ static struct apic apic_physflat __ro_after_init = { 
	.probe				= physflat_probe,

	.acpi_madt_oem_check		= physflat_acpi_madt_oem_check,

	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= flat_apic_id_registered,

	.apic_id_registered		= default_apic_id_registered,



	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.dest_mode_logical		= false,

arch/x86/kernel/apic/apic_noop.c

+0 −12
Original line number Diff line number Diff line
@@ -57,17 +57,6 @@ static int noop_probe(void) 
	return 0;

}



static int noop_apic_id_registered(void)

{

	/*

	 * if we would be really "pedantic"

	 * we should pass read_apic_id() here

	 * but since NOOP suppose APIC ID = 0

	 * lets save a few cycles

	 */

	return physid_isset(0, phys_cpu_present_map);

}



static u32 noop_apic_read(u32 reg)

{

	WARN_ON_ONCE(boot_cpu_has(X86_FEATURE_APIC) && !apic_is_disabled);
@@ -85,7 +74,6 @@ struct apic apic_noop __ro_after_init = { 
	.acpi_madt_oem_check		= NULL,



	.apic_id_valid			= default_apic_id_valid,

	.apic_id_registered		= noop_apic_id_registered,



	.delivery_mode			= APIC_DELIVERY_MODE_FIXED,

	.dest_mode_logical		= true,