diff mbox series

[V3,42/60] x86/apic: Add max_apic_id member

Message ID	20230801103817.458525669@linutronix.de
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Message-ID: <20230801103817.458525669@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: x86@kernel.org, Andrew Cooper <andrew.cooper3@citrix.com>, Tom Lendacky <thomas.lendacky@amd.com>, Paolo Bonzini <pbonzini@redhat.com>, Wei Liu <wei.liu@kernel.org>, Arjan van de Ven <arjan@linux.intel.com>, Juergen Gross <jgross@suse.com>, Michael Kelley <mikelley@microsoft.com>, Peter Keresztes Schmidt <peter@keresztesschmidt.de>, "Peter Zijlstra (Intel)" <peterz@infradead.org> Subject: [patch V3 42/60] x86/apic: Add max_apic_id member References: <20230801103042.936020332@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Tue, 1 Aug 2023 12:47:33 +0200 (CEST) Precedence: bulk
Series	[V3,01/60] x86/cpu: Make identify_boot_cpu() static \| [V3,01/60] x86/cpu: Make identify_boot_cpu() static [V3,02/60] x86/cpu: Remove unused physid_() nonsense [V3,03/60] x86/apic: Rename disable_apic [V3,04/60] x86/apic/ioapic: Rename skip_ioapic_setup [V3,05/60] x86/apic: Remove pointless x86_bios_cpu_apicid [V3,06/60] x86/apic: Get rid of hard_smp_processor_id() [V3,07/60] x86/apic: Remove unused max_physical_apicid [V3,08/60] x86/apic: Nuke unused apic::inquire_remote_apic() [V3,09/60] x86/apic: Get rid of boot_cpu_physical_apicid madness [V3,10/60] x86/apic: Register boot CPU APIC early [V3,11/60] x86/apic: Remove the pointless APIC version check [V3,12/60] x86/of: Fix the APIC address registration [V3,13/60] x86/apic: Make some APIC init functions bool [V3,14/60] x86/apic: Split register_apic_address() [V3,15/60] x86/apic: Sanitize APIC address setup [V3,16/60] x86/xen/pv: Pretend that it found SMP configuration [V3,17/60] x86/apic: Sanitize num_processors handling [V3,18/60] x86/apic: Nuke another processor check [V3,19/60] x86/apic: Remove check_phys_apicid_present() [V3,20/60] x86/apic: Get rid of apic_phys [V3,21/60] x86/apic/32: Sanitize logical APIC ID handling [V3,22/60] x86/apic/32: Remove x86_cpu_to_logical_apicid [V3,23/60] x86/apic/ipi: Code cleanup [V3,24/60] x86/apic: Mop up early_per_cpu() abuse [V3,25/60] x86/apic/32: Remove pointless default_acpi_madt_oem_check() [V3,26/60] x86/apic/32: Decrapify the def_bigsmp mechanism [V3,27/60] x86/apic/32: Remove bigsmp_cpu_present_to_apicid() [V3,28/60] x86/apic: Nuke empty init_apic_ldr() callbacks [V3,29/60] x86/apic: Nuke apic::apicid_to_cpu_present() [V3,30/60] x86/ioapic/32: Decrapify phys_id_present_map operation [V3,31/60] x86/apic: Mop up setup_apic_routing() [V3,32/60] x86/apic: Mop up apic::apic_id_registered() [V3,33/60] x86/apic/ipi: Tidy up the code and fixup comments [V3,34/60] x86/apic: Consolidate wait_icr_idle() implementations [V3,35/60] x86/apic: Allow apic::wait_icr_idle() to be NULL [V3,36/60] x86/apic: Allow apic::safe_wait_icr_idle() to be NULL [V3,37/60] x86/apic: Move safe wait_icr_idle() next to apic_mem_wait_icr_idle() [V3,38/60] x86/apic/uv: Get rid of wrapper callbacks [V3,39/60] x86/apic/x2apic: Share all common IPI functions [V3,40/60] x86/apic/64: Uncopypaste probing [V3,41/60] x86/apic: Wrap APIC ID validation into an inline [V3,42/60] x86/apic: Add max_apic_id member [V3,43/60] x86/apic: Simplify X2APIC ID validation [V3,44/60] x86/apic: Prepare x2APIC for using apic::max_apic_id [V3,45/60] x86/apic: Sanitize APID ID range validation [V3,46/60] x86/apic: Remove pointless NULL initializations [V3,47/60] x86/apic/noop: Tidy up the code [V3,48/60] x86/apic: Remove pointless arguments from [native_]eoi_write() [V3,49/60] x86/apic: Nuke ack_APIC_irq() [V3,50/60] x86/apic: Wrap apic->native_eoi() into a helper [V3,51/60] x86/apic: Provide common init infrastructure [V3,52/60] x86/xen/apic: Use standard apic driver mechanism for Xen PV [V3,53/60] x86/apic: Provide apic_update_callback() [V3,54/60] x86/apic: Replace acpi_wake_cpu_handler_update() and apic_set_eoi_cb() [V3,55/60] x86/apic: Convert other overrides to apic_update_callback() [V3,56/60] x86/xen/apic: Mark apic __ro_after_init [V3,57/60] x86/apic: Mark all hotpath APIC callback wrappers __always_inline [V3,58/60] x86/apic: Wrap IPI calls into helper functions [V3,59/60] x86/apic: Provide static call infrastructure for APIC callbacks [V3,60/60] x86/apic: Turn on static calls

Commit Message

Thomas Gleixner Aug. 1, 2023, 10:47 a.m. UTC

  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>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
 arch/x86/include/asm/apic.h           |    3 +++
 arch/x86/kernel/apic/apic_flat_64.c   |    2 ++
 arch/x86/kernel/apic/apic_noop.c      |    1 +
 arch/x86/kernel/apic/apic_numachip.c  |    2 ++
 arch/x86/kernel/apic/bigsmp_32.c      |    1 +
 arch/x86/kernel/apic/probe_32.c       |    1 +
 arch/x86/kernel/apic/x2apic_cluster.c |    1 +
 arch/x86/kernel/apic/x2apic_phys.c    |    1 +
 arch/x86/kernel/apic/x2apic_uv_x.c    |    1 +
 arch/x86/xen/apic.c                   |    1 +
 10 files changed, 14 insertions(+)

diff mbox series

Patch

--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -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);
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -94,6 +94,7 @@  static struct apic apic_flat __ro_after_
 	.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_af
 	.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,
 
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -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,
 
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -239,6 +239,7 @@  static const struct apic apic_numachip1
 	.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
 	.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,
 
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -91,6 +91,7 @@  static struct apic apic_bigsmp __ro_afte
 	.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,
 
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -47,6 +47,7 @@  static struct apic apic_default __ro_aft
 	.cpu_present_to_apicid		= default_cpu_present_to_apicid,
 	.phys_pkg_id			= default_phys_pkg_id,
 
+	.max_apic_id			= 0xFE,
 	.get_apic_id			= default_get_apic_id,
 	.set_apic_id			= NULL,
 
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -239,6 +239,7 @@  static struct apic apic_x2apic_cluster _
 	.cpu_present_to_apicid		= default_cpu_present_to_apicid,
 	.phys_pkg_id			= x2apic_phys_pkg_id,
 
+	.max_apic_id			= UINT_MAX,
 	.get_apic_id			= x2apic_get_apic_id,
 	.set_apic_id			= x2apic_set_apic_id,
 
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -163,6 +163,7 @@  static struct apic apic_x2apic_phys __ro
 	.cpu_present_to_apicid		= default_cpu_present_to_apicid,
 	.phys_pkg_id			= x2apic_phys_pkg_id,
 
+	.max_apic_id			= UINT_MAX,
 	.get_apic_id			= x2apic_get_apic_id,
 	.set_apic_id			= x2apic_set_apic_id,
 
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -822,6 +822,7 @@  static struct apic apic_x2apic_uv_x __ro
 	.cpu_present_to_apicid		= default_cpu_present_to_apicid,
 	.phys_pkg_id			= uv_phys_pkg_id,
 
+	.max_apic_id			= UINT_MAX,
 	.get_apic_id			= x2apic_get_apic_id,
 	.set_apic_id			= set_apic_id,
 
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -138,6 +138,7 @@  static struct apic xen_pv_apic = {
 	.cpu_present_to_apicid		= xen_cpu_present_to_apicid,
 	.phys_pkg_id			= xen_phys_pkg_id, /* detect_ht */
 
+	.max_apic_id			= UINT_MAX,
 	.get_apic_id 			= xen_get_apic_id,
 	.set_apic_id 			= xen_set_apic_id, /* Can be NULL on 32-bit. */