From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Linus Torvalds <torvalds@linux-foundation.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>
Subject: [patch 30/58] x86/apic: Mop up *setup_apic_routing()
Date: Tue, 18 Jul 2023 01:15:21 +0200 (CEST) [thread overview]
Message-ID: <20230717223224.862165651@linutronix.de> (raw)
In-Reply-To: <20230717223049.327865981@linutronix.de>
default_setup_apic_routing() is a complete misnomer. On 64bit it does the
actual APIC probing and on 32bit it is used to force select the bigsmp APIC
and to emit a redundant message in the apic::setup_apic_routing() callback.
Rename the 64bit and 32bit function so they reflect what they are doing and
remove the useless APIC callback.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/apic.h | 10 ++++------
arch/x86/kernel/apic/apic.c | 4 +++-
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 | 8 --------
arch/x86/kernel/apic/local.h | 2 ++
arch/x86/kernel/apic/probe_32.c | 17 ++---------------
arch/x86/kernel/apic/probe_64.c | 2 +-
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/kernel/setup.c | 2 +-
arch/x86/xen/apic.c | 1 -
14 files changed, 13 insertions(+), 41 deletions(-)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -40,11 +40,9 @@
#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
-extern void generic_apic_probe(void);
+extern void x86_32_probe_apic(void);
#else
-static inline void generic_apic_probe(void)
-{
-}
+static inline void x86_32_probe_apic(void) { }
#endif
#ifdef CONFIG_X86_LOCAL_APIC
@@ -302,7 +300,6 @@ struct apic {
bool (*check_apicid_used)(physid_mask_t *map, int apicid);
void (*init_apic_ldr)(void);
void (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);
- void (*setup_apic_routing)(void);
int (*cpu_present_to_apicid)(int mps_cpu);
int (*phys_pkg_id)(int cpuid_apic, int index_msb);
@@ -457,12 +454,13 @@ static inline unsigned int read_apic_id(
typedef int (*wakeup_cpu_handler)(int apicid, unsigned long start_eip);
extern void acpi_wake_cpu_handler_update(wakeup_cpu_handler handler);
extern int default_acpi_madt_oem_check(char *, char *);
+extern void x86_64_probe_apic(void);
#else
static inline int default_acpi_madt_oem_check(char *a, char *b) { return 0; }
+static inline void x86_64_probe_apic(void) { }
#endif
extern int default_apic_id_valid(u32 apicid);
-extern void default_setup_apic_routing(void);
extern u32 apic_default_calc_apicid(unsigned int cpu);
extern u32 apic_flat_calc_apicid(unsigned int cpu);
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1419,7 +1419,9 @@ void __init apic_intr_mode_init(void)
break;
}
- default_setup_apic_routing();
+ x86_64_probe_apic();
+
+ x86_32_install_bigsmp();
if (x86_platform.apic_post_init)
x86_platform.apic_post_init();
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -101,7 +101,6 @@ static struct apic apic_flat __ro_after_
.check_apicid_used = NULL,
.init_apic_ldr = default_init_apic_ldr,
.ioapic_phys_id_map = NULL,
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = flat_phys_pkg_id,
@@ -178,7 +177,6 @@ static struct apic apic_physflat __ro_af
.check_apicid_used = NULL,
.ioapic_phys_id_map = NULL,
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = flat_phys_pkg_id,
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -94,7 +94,6 @@ struct apic apic_noop __ro_after_init =
.check_apicid_used = default_check_apicid_used,
.ioapic_phys_id_map = default_ioapic_phys_id_map,
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = noop_phys_pkg_id,
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -253,7 +253,6 @@ static const struct apic apic_numachip1
.check_apicid_used = NULL,
.ioapic_phys_id_map = NULL,
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = numachip_phys_pkg_id,
@@ -296,7 +295,6 @@ static const struct apic apic_numachip2
.check_apicid_used = NULL,
.ioapic_phys_id_map = NULL,
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = numachip_phys_pkg_id,
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -28,13 +28,6 @@ static bool bigsmp_check_apicid_used(phy
return false;
}
-static void bigsmp_setup_apic_routing(void)
-{
- printk(KERN_INFO
- "Enabling APIC mode: Physflat. Using %d I/O APICs\n",
- nr_ioapics);
-}
-
static void bigsmp_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap)
{
/* For clustered we don't have a good way to do this yet - hack */
@@ -101,7 +94,6 @@ static struct apic apic_bigsmp __ro_afte
.check_apicid_used = bigsmp_check_apicid_used,
.ioapic_phys_id_map = bigsmp_ioapic_phys_id_map,
- .setup_apic_routing = bigsmp_setup_apic_routing,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = bigsmp_phys_pkg_id,
--- a/arch/x86/kernel/apic/local.h
+++ b/arch/x86/kernel/apic/local.h
@@ -66,8 +66,10 @@ void default_send_IPI_mask_sequence_logi
void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask, int vector);
void default_send_IPI_mask_logical(const struct cpumask *mask, int vector);
void x86_32_probe_bigsmp_early(void);
+void x86_32_install_bigsmp(void);
#else
static inline void x86_32_probe_bigsmp_early(void) { }
+static inline void x86_32_install_bigsmp(void) { }
#endif
#ifdef CONFIG_X86_BIGSMP
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -18,15 +18,6 @@
#include "local.h"
-static void setup_apic_flat_routing(void)
-{
-#ifdef CONFIG_X86_IO_APIC
- printk(KERN_INFO
- "Enabling APIC mode: Flat. Using %d I/O APICs\n",
- nr_ioapics);
-#endif
-}
-
static int default_apic_id_registered(void)
{
return physid_isset(read_apic_id(), phys_cpu_present_map);
@@ -58,7 +49,6 @@ static struct apic apic_default __ro_aft
.check_apicid_used = default_check_apicid_used,
.init_apic_ldr = default_init_apic_ldr,
.ioapic_phys_id_map = default_ioapic_phys_id_map,
- .setup_apic_routing = setup_apic_flat_routing,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = default_phys_pkg_id,
@@ -132,16 +122,13 @@ void __init x86_32_probe_bigsmp_early(vo
set_nr_cpu_ids(8);
}
-void __init default_setup_apic_routing(void)
+void __init x86_32_install_bigsmp(void)
{
if (nr_cpu_ids >= 8 && !xen_pv_domain())
apic_bigsmp_force();
-
- if (apic->setup_apic_routing)
- apic->setup_apic_routing();
}
-void __init generic_apic_probe(void)
+void __init x86_32_probe_apic(void)
{
if (!cmdline_apic) {
struct apic **drv;
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -14,7 +14,7 @@
#include "local.h"
/* Select the appropriate APIC driver */
-void __init default_setup_apic_routing(void)
+void __init x86_64_probe_apic(void)
{
struct apic **drv;
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -247,7 +247,6 @@ static struct apic apic_x2apic_cluster _
.check_apicid_used = NULL,
.init_apic_ldr = init_x2apic_ldr,
.ioapic_phys_id_map = NULL,
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = x2apic_phys_pkg_id,
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -166,7 +166,6 @@ static struct apic apic_x2apic_phys __ro
.check_apicid_used = NULL,
.ioapic_phys_id_map = NULL,
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = x2apic_phys_pkg_id,
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -838,7 +838,6 @@ static struct apic apic_x2apic_uv_x __ro
.check_apicid_used = NULL,
.ioapic_phys_id_map = NULL,
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.phys_pkg_id = uv_phys_pkg_id,
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1253,7 +1253,7 @@ void __init setup_arch(char **cmdline_p)
map_vsyscall();
- generic_apic_probe();
+ x86_32_probe_apic();
early_quirks();
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -150,7 +150,6 @@ static struct apic xen_pv_apic = {
.check_apicid_used = default_check_apicid_used, /* Used on 32-bit */
.ioapic_phys_id_map = default_ioapic_phys_id_map, /* Used on 32-bit */
- .setup_apic_routing = NULL,
.cpu_present_to_apicid = xen_cpu_present_to_apicid,
.phys_pkg_id = xen_phys_pkg_id, /* detect_ht */
next prev parent reply other threads:[~2023-07-17 23:17 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 23:14 [patch 00/58] x86/apic: Decrapification and static calls Thomas Gleixner
2023-07-17 23:14 ` [patch 01/58] x86/cpu: Make identify_boot_cpu() static Thomas Gleixner
2023-07-17 23:14 ` [patch 02/58] x86/cpu: Remove unused physid_*() nonsense Thomas Gleixner
2023-07-17 23:14 ` [patch 03/58] x86/apic: Rename disable_apic Thomas Gleixner
2023-07-17 23:14 ` [patch 04/58] x86/apic/ioapic: Rename skip_ioapic_setup Thomas Gleixner
2023-07-17 23:14 ` [patch 05/58] x86/apic: Remove pointless x86_bios_cpu_apicid Thomas Gleixner
2023-07-17 23:14 ` [patch 06/58] x86/apic: Get rid of hard_smp_processor_id() Thomas Gleixner
2023-07-17 23:14 ` [patch 07/58] x86/apic: Remove unused max_physical_apicid Thomas Gleixner
2023-07-17 23:14 ` [patch 08/58] x86/apic: Nuke unused apic::inquire_remote_apic() Thomas Gleixner
2023-07-17 23:14 ` [patch 09/58] x86/apic: Get rid of boot_cpu_physical_apicid madness Thomas Gleixner
2023-07-17 23:14 ` [patch 10/58] x86/apic: Register boot CPU APIC early Thomas Gleixner
2023-07-17 23:14 ` [patch 11/58] x86/apic: Remove the pointless APIC version check Thomas Gleixner
2023-07-17 23:14 ` [patch 12/58] x86/of: Fix the APIC address registration Thomas Gleixner
2023-07-17 23:14 ` [patch 13/58] x86/apic: Make some APIC init functions bool Thomas Gleixner
2023-07-17 23:14 ` [patch 14/58] x86/apic: Split register_apic_address() Thomas Gleixner
2023-07-17 23:14 ` [patch 15/58] x86/apic: Sanitize APIC address setup Thomas Gleixner
2023-07-17 23:14 ` [patch 16/58] x86/apic: Sanitize num_processors handling Thomas Gleixner
2023-07-17 23:15 ` [patch 17/58] x86/apic: Nuke another processor check Thomas Gleixner
2023-07-17 23:15 ` [patch 18/58] x86/apic: Remove check_phys_apicid_present() Thomas Gleixner
2023-07-17 23:15 ` [patch 19/58] x86/apic: Get rid of apic_phys Thomas Gleixner
2023-07-18 13:11 ` Thomas Gleixner
2023-07-20 4:18 ` Michael Kelley (LINUX)
2023-07-20 8:03 ` Thomas Gleixner
2023-07-21 4:17 ` Michael Kelley (LINUX)
2023-07-17 23:15 ` [patch 20/58] x86/apic/32: Sanitize logical APIC ID handling Thomas Gleixner
2023-07-17 23:15 ` [patch 21/58] x86/apic/32: Remove x86_cpu_to_logical_apicid Thomas Gleixner
2023-07-17 23:15 ` [patch 22/58] x86/apic/ipi: Code cleanup Thomas Gleixner
2023-07-17 23:15 ` [patch 23/58] x86/apic: Mop up early_per_cpu() abuse Thomas Gleixner
2023-07-17 23:15 ` [patch 24/58] x86/apic/32: Remove pointless default_acpi_madt_oem_check() Thomas Gleixner
2023-07-18 4:28 ` Juergen Gross
2023-07-17 23:15 ` [patch 25/58] x86/apic/32: Decrapify the def_bigsmp mechanism Thomas Gleixner
2023-07-17 23:15 ` [patch 26/58] x86/apic/32: Remove bigsmp_cpu_present_to_apicid() Thomas Gleixner
2023-07-17 23:15 ` [patch 27/58] x86/apic: Nuke empty init_apic_ldr() callbacks Thomas Gleixner
2023-07-17 23:15 ` [patch 28/58] x86/apic: Nuke apic::apicid_to_cpu_present() Thomas Gleixner
2023-07-17 23:15 ` [patch 29/58] x86/ioapic/32: Decrapify phys_id_present_map operation Thomas Gleixner
2023-07-17 23:15 ` Thomas Gleixner [this message]
2023-07-17 23:15 ` [patch 31/58] x86/apic: Mop up apic::apic_id_registered() Thomas Gleixner
2023-07-17 23:15 ` [patch 32/58] x86/apic/ipi: Tidy up the code and fixup comments Thomas Gleixner
2023-07-17 23:15 ` [patch 33/58] x86/apic: Consolidate wait_icr_idle() implementations Thomas Gleixner
2023-07-17 23:15 ` [patch 34/58] x86/apic: Allow apic::wait_icr_idle() to be NULL Thomas Gleixner
2023-07-17 23:15 ` [patch 35/58] x86/apic: Allow apic::safe_wait_icr_idle() " Thomas Gleixner
2023-07-17 23:15 ` [patch 36/58] x86/apic: Move safe wait_icr_idle() next to apic_mem_wait_icr_idle() Thomas Gleixner
2023-07-17 23:15 ` [patch 37/58] x86/apic/uv: Get rid of wrapper callbacks Thomas Gleixner
2023-07-17 23:15 ` [patch 38/58] x86/apic/x2apic: Share all common IPI functions Thomas Gleixner
2023-07-17 23:15 ` [patch 39/58] x86/apic/64: Uncopypaste probing Thomas Gleixner
2023-07-17 23:15 ` [patch 40/58] x86/apic: Wrap APIC ID validation into an inline Thomas Gleixner
2023-07-17 23:15 ` [patch 41/58] x86/apic: Add max_apic_id member Thomas Gleixner
2023-07-18 0:19 ` Linus Torvalds
2023-07-18 7:47 ` Thomas Gleixner
2023-07-18 15:54 ` Thomas Gleixner
2023-07-18 16:06 ` Linus Torvalds
2023-07-18 18:59 ` Thomas Gleixner
2023-07-17 23:15 ` [patch 42/58] x86/apic: Simplify X2APIC ID validation Thomas Gleixner
2023-07-17 23:15 ` [patch 43/58] x86/apic: Prepare x2APIC for using apic::max_apic_id Thomas Gleixner
2023-07-17 23:15 ` [patch 44/58] x86/apic: Sanitize APID ID range validation Thomas Gleixner
2023-07-17 23:15 ` [patch 45/58] x86/apic: Remove pointless NULL initializations Thomas Gleixner
2023-07-17 23:15 ` [patch 46/58] x86/apic/noop: Tidy up the code Thomas Gleixner
2023-07-17 23:15 ` [patch 47/58] x86/apic: Remove pointless arguments from [native_]eoi_write() Thomas Gleixner
2023-07-23 22:45 ` Wei Liu
2023-07-17 23:15 ` [patch 48/58] x86/apic: Nuke ack_APIC_irq() Thomas Gleixner
2023-07-23 22:45 ` Wei Liu
2023-07-17 23:15 ` [patch 49/58] x86/apic: Wrap apic->native_eoi() into a helper Thomas Gleixner
2023-07-17 23:15 ` [patch 50/58] x86/apic: Provide common init infrastructure Thomas Gleixner
2023-07-18 21:29 ` Peter Keresztes Schmidt
2023-07-18 21:51 ` Thomas Gleixner
2023-07-17 23:15 ` [patch 51/58] x86/apic: Provide apic_update_callback() Thomas Gleixner
2023-07-21 4:27 ` Michael Kelley (LINUX)
2023-07-17 23:15 ` [patch 52/58] x86/apic: Replace acpi_wake_cpu_handler_update() and apic_set_eoi_cb() Thomas Gleixner
2023-07-23 22:55 ` Wei Liu
2023-07-17 23:15 ` [patch 53/58] x86/apic: Convert other overrides to apic_update_callback() Thomas Gleixner
2023-07-21 17:49 ` Michael Kelley (LINUX)
2023-07-23 12:32 ` Thomas Gleixner
2023-07-17 23:15 ` [patch 54/58] x86/xen/apic: Mark apic __ro_after_init Thomas Gleixner
2023-07-18 15:31 ` Juergen Gross
2023-07-18 15:56 ` Thomas Gleixner
2023-07-18 16:08 ` Juergen Gross
2023-07-17 23:16 ` [patch 55/58] x86/apic: Mark all hotpath APIC callback wrappers __always_inline Thomas Gleixner
2023-07-17 23:16 ` [patch 56/58] x86/apic: Wrap IPI calls into helper functions Thomas Gleixner
2023-07-17 23:16 ` [patch 57/58] x86/apic: Provide static call infrastructure for APIC callbacks Thomas Gleixner
2023-07-18 9:19 ` Peter Zijlstra
2023-07-17 23:16 ` [patch 58/58] x86/apic: Turn on static calls Thomas Gleixner
2023-07-18 13:35 ` Thomas Gleixner
2023-07-18 0:27 ` [patch 00/58] x86/apic: Decrapification and " Linus Torvalds
2023-07-18 9:23 ` Peter Zijlstra
2023-07-18 14:29 ` Linus Walleij
2023-07-24 16:59 ` William Breathitt Gray
2023-07-20 12:43 ` Marc Gonzalez
2023-07-20 13:13 ` Peter Zijlstra
2023-07-20 13:47 ` Thomas Gleixner
2023-07-20 15:16 ` Marc Gonzalez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230717223224.862165651@linutronix.de \
--to=tglx@linutronix.de \
--cc=andrew.cooper3@citrix.com \
--cc=arjan@linux.intel.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=thomas.lendacky@amd.com \
--cc=torvalds@linux-foundation.org \
--cc=wei.liu@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome