From nobody Mon Feb 9 21:19:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E168FC0015E for ; Mon, 17 Jul 2023 23:32:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231660AbjGQXc0 (ORCPT ); Mon, 17 Jul 2023 19:32:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbjGQXcX (ORCPT ); Mon, 17 Jul 2023 19:32:23 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AF0410FF for ; Mon, 17 Jul 2023 16:31:25 -0700 (PDT) Message-ID: <20230717223225.515238528@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689635738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=c6/l6FDyGOdgCBOzK6YM6Al7WkOQ1ZlJVvPCzCOr2Oc=; b=PwXUrh0eXPLIe807EceAtbRNsYdNTOdidk7cstYM+s51wVsQiziUIczLzUU/Q98eRqsIaJ UesYZj7Swn1Ys7MoCvfa8vUB9nmG/B2vZbcL4mgoyCDp44BQ9Ij0vXM4MtJ06uzKZl+W7x 1pwbBnWDsUcdQH9VvGGnUveUnRbP4N8MzZpw2nDIOsWY8reGUbFNrpOVHGgMBxD6k+k4ov fNuuJ8w24gz9MlJ+klSVzfk3yhtYwBN75/GfMcF0dsQgK1lu8gAoZtETno4KwltupV5Akm bH1PGY5a+uTJaNgy/2xhZp+XgQNobf4P/bNBgb6RQxmk7gS49HE4GOS+rhNH/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689635738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=c6/l6FDyGOdgCBOzK6YM6Al7WkOQ1ZlJVvPCzCOr2Oc=; b=tv9bAsob+ud2xRxMgItASl8k6W9hHNoTeFSxcOZqvz/zyhehM2XZdTkA/01XTZEmVUfJOm c434w9zKYSYnBMDw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Linus Torvalds , Andrew Cooper , Tom Lendacky , Paolo Bonzini , Wei Liu , Arjan van de Ven , Juergen Gross Subject: [patch 41/58] x86/apic: Add max_apic_id member References: <20230717223049.327865981@linutronix.de> MIME-Version: 1.0 Date: Tue, 18 Jul 2023 01:15:38 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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(+) --- 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); =20 + /* 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 =3D default_cpu_present_to_apicid, .phys_pkg_id =3D flat_phys_pkg_id, =20 + .max_apic_id =3D 0xFE, .get_apic_id =3D flat_get_apic_id, .set_apic_id =3D set_apic_id, =20 @@ -170,6 +171,7 @@ static struct apic apic_physflat __ro_af .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .phys_pkg_id =3D flat_phys_pkg_id, =20 + .max_apic_id =3D 0xFE, .get_apic_id =3D flat_get_apic_id, .set_apic_id =3D set_apic_id, =20 --- 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 =3D =20 .phys_pkg_id =3D noop_phys_pkg_id, =20 + .max_apic_id =3D 0xFE, .get_apic_id =3D noop_get_apic_id, .set_apic_id =3D NULL, =20 --- 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 =3D default_cpu_present_to_apicid, .phys_pkg_id =3D numachip_phys_pkg_id, =20 + .max_apic_id =3D UINT_MAX, .get_apic_id =3D numachip1_get_apic_id, .set_apic_id =3D numachip1_set_apic_id, =20 @@ -278,6 +279,7 @@ static const struct apic apic_numachip2 .cpu_present_to_apicid =3D default_cpu_present_to_apicid, .phys_pkg_id =3D numachip_phys_pkg_id, =20 + .max_apic_id =3D UINT_MAX, .get_apic_id =3D numachip2_get_apic_id, .set_apic_id =3D numachip2_set_apic_id, =20 --- 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 =3D default_cpu_present_to_apicid, .phys_pkg_id =3D bigsmp_phys_pkg_id, =20 + .max_apic_id =3D 0xFE, .get_apic_id =3D bigsmp_get_apic_id, .set_apic_id =3D NULL, =20 --- 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 =3D default_cpu_present_to_apicid, .phys_pkg_id =3D default_phys_pkg_id, =20 + .max_apic_id =3D 0xFE, .get_apic_id =3D default_get_apic_id, .set_apic_id =3D NULL, =20 --- 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 =3D default_cpu_present_to_apicid, .phys_pkg_id =3D x2apic_phys_pkg_id, =20 + .max_apic_id =3D UINT_MAX, .get_apic_id =3D x2apic_get_apic_id, .set_apic_id =3D x2apic_set_apic_id, =20 --- 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 =3D default_cpu_present_to_apicid, .phys_pkg_id =3D x2apic_phys_pkg_id, =20 + .max_apic_id =3D UINT_MAX, .get_apic_id =3D x2apic_get_apic_id, .set_apic_id =3D x2apic_set_apic_id, =20 --- 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 =3D default_cpu_present_to_apicid, .phys_pkg_id =3D uv_phys_pkg_id, =20 + .max_apic_id =3D UINT_MAX, .get_apic_id =3D x2apic_get_apic_id, .set_apic_id =3D set_apic_id, =20 --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -138,6 +138,7 @@ static struct apic xen_pv_apic =3D { .cpu_present_to_apicid =3D xen_cpu_present_to_apicid, .phys_pkg_id =3D xen_phys_pkg_id, /* detect_ht */ =20 + .max_apic_id =3D UINT_MAX, .get_apic_id =3D xen_get_apic_id, .set_apic_id =3D xen_set_apic_id, /* Can be NULL on 32-bit. */