Commit d92e5e7c authored Aug 08, 2023 by Thomas Gleixner Committed by Dave Hansen Aug 09, 2023

x86/apic: Add max_apic_id member



There is really no point to have a callback which compares numbers.

Add a field which allows each APIC to store the maximum APIC ID supported
and fill it in for all APIC incarnations.

The next step will remove the callback.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)

parent 9132d720

arch/x86/include/asm/apic.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -277,6 +277,9 @@ struct apic {
		u64 (*icr_read)(void);
		void (*icr_write)(u32 low, u32 high);

		/* The limit of the APIC ID space. */
		u32 max_apic_id;

		/* Probe, setup and smpboot functions */
		int (*probe)(void);
		int (acpi_madt_oem_check)(char oem_id, char *oem_table_id);

arch/x86/kernel/apic/apic_flat_64.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ static struct apic apic_flat __ro_after_init = {
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.phys_pkg_id = flat_phys_pkg_id,

		.max_apic_id = 0xFE,
		.get_apic_id = flat_get_apic_id,
		.set_apic_id = set_apic_id,

		@@ -170,6 +171,7 @@ static struct apic apic_physflat __ro_after_init = {
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.phys_pkg_id = flat_phys_pkg_id,

		.max_apic_id = 0xFE,
		.get_apic_id = flat_get_apic_id,
		.set_apic_id = set_apic_id,

arch/x86/kernel/apic/apic_noop.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ struct apic apic_noop __ro_after_init = {

		.phys_pkg_id = noop_phys_pkg_id,

		.max_apic_id = 0xFE,
		.get_apic_id = noop_get_apic_id,
		.set_apic_id = NULL,

arch/x86/kernel/apic/apic_numachip.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -239,6 +239,7 @@ static const struct apic apic_numachip1 __refconst = {
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.phys_pkg_id = numachip_phys_pkg_id,

		.max_apic_id = UINT_MAX,
		.get_apic_id = numachip1_get_apic_id,
		.set_apic_id = numachip1_set_apic_id,

		@@ -278,6 +279,7 @@ static const struct apic apic_numachip2 __refconst = {
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.phys_pkg_id = numachip_phys_pkg_id,

		.max_apic_id = UINT_MAX,
		.get_apic_id = numachip2_get_apic_id,
		.set_apic_id = numachip2_set_apic_id,

arch/x86/kernel/apic/bigsmp_32.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ static struct apic apic_bigsmp __ro_after_init = {
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.phys_pkg_id = bigsmp_phys_pkg_id,

		.max_apic_id = 0xFE,
		.get_apic_id = bigsmp_get_apic_id,
		.set_apic_id = NULL,