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 28/60] x86/apic: Nuke empty init_apic_ldr() callbacks
Date: Tue, 1 Aug 2023 12:47:15 +0200 (CEST) [thread overview]
Message-ID: <20230801103816.692336580@linutronix.de> (raw)
In-Reply-To: 20230801103042.936020332@linutronix.de
apic::init_apic_ldr() is only invoked when the APIC is initialized. So
there is really no point in having:
- Default empty callbacks all over the place
- Two implementations of the actual LDR init function where one is
just unreadable gunk but does exactly the same as the other.
Make the apic::init_apic_ldr() invocation conditional, remove the empty
callbacks and consolidate the two implementation into one.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/include/asm/apic.h | 2 --
arch/x86/kernel/apic/apic.c | 7 +++++--
arch/x86/kernel/apic/apic_common.c | 16 ++++++++++++++++
arch/x86/kernel/apic/apic_flat_64.c | 32 +-------------------------------
arch/x86/kernel/apic/apic_noop.c | 2 --
arch/x86/kernel/apic/apic_numachip.c | 2 --
arch/x86/kernel/apic/bigsmp_32.c | 9 ---------
arch/x86/kernel/apic/local.h | 5 ++---
arch/x86/kernel/apic/probe_32.c | 15 ---------------
arch/x86/kernel/apic/x2apic_phys.c | 5 -----
arch/x86/kernel/apic/x2apic_uv_x.c | 5 -----
arch/x86/xen/apic.c | 1 -
12 files changed, 24 insertions(+), 77 deletions(-)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -445,8 +445,6 @@ extern void generic_bigsmp_probe(void);
#include <asm/smp.h>
-#define APIC_DFR_VALUE (APIC_DFR_FLAT)
-
extern struct apic apic_noop;
static inline unsigned int read_apic_id(void)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1578,9 +1578,12 @@ static void setup_local_APIC(void)
/*
* Intel recommends to set DFR, LDR and TPR before enabling
* an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel
- * document number 292116). So here it goes...
+ * document number 292116).
+ *
+ * Except for APICs which operate in physical destination mode.
*/
- apic->init_apic_ldr();
+ if (apic->init_apic_ldr)
+ apic->init_apic_ldr();
/*
* Set Task Priority to 'accept all except vectors 0-31'. An APIC
--- a/arch/x86/kernel/apic/apic_common.c
+++ b/arch/x86/kernel/apic/apic_common.c
@@ -6,6 +6,8 @@
#include <linux/irq.h>
#include <asm/apic.h>
+#include "local.h"
+
u32 apic_default_calc_apicid(unsigned int cpu)
{
return per_cpu(x86_cpu_to_apicid, cpu);
@@ -39,3 +41,17 @@ int default_apic_id_valid(u32 apicid)
{
return (apicid < 255);
}
+
+/*
+ * Set up the logical destination ID when the APIC operates in logical
+ * destination mode.
+ */
+void default_init_apic_ldr(void)
+{
+ unsigned long val;
+
+ apic_write(APIC_DFR, APIC_DFR_FLAT);
+ val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
+ val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id());
+ apic_write(APIC_LDR, val);
+}
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -28,26 +28,6 @@ static int flat_acpi_madt_oem_check(char
return 1;
}
-/*
- * Set up the logical destination ID.
- *
- * Intel recommends to set DFR, LDR and TPR before enabling
- * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel
- * document number 292116). So here it goes...
- */
-void flat_init_apic_ldr(void)
-{
- unsigned long val;
- unsigned long num, id;
-
- num = smp_processor_id();
- id = 1UL << num;
- apic_write(APIC_DFR, APIC_DFR_FLAT);
- val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
- val |= SET_APIC_LOGICAL_ID(id);
- apic_write(APIC_LDR, val);
-}
-
static void _flat_send_IPI_mask(unsigned long mask, int vector)
{
unsigned long flags;
@@ -119,7 +99,7 @@ static struct apic apic_flat __ro_after_
.disable_esr = 0,
.check_apicid_used = NULL,
- .init_apic_ldr = flat_init_apic_ldr,
+ .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,
@@ -175,15 +155,6 @@ static int physflat_acpi_madt_oem_check(
return 0;
}
-static void physflat_init_apic_ldr(void)
-{
- /*
- * LDR and DFR are not involved in physflat mode, rather:
- * "In physical destination mode, the destination processor is
- * specified by its local APIC ID [...]." (Intel SDM, 10.6.2.1)
- */
-}
-
static int physflat_probe(void)
{
if (apic == &apic_physflat || num_possible_cpus() > 8 ||
@@ -207,7 +178,6 @@ static struct apic apic_physflat __ro_af
.disable_esr = 0,
.check_apicid_used = NULL,
- .init_apic_ldr = physflat_init_apic_ldr,
.ioapic_phys_id_map = NULL,
.setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -14,7 +14,6 @@
#include <asm/apic.h>
-static void noop_init_apic_ldr(void) { }
static void noop_send_IPI(int cpu, int vector) { }
static void noop_send_IPI_mask(const struct cpumask *cpumask, int vector) { }
static void noop_send_IPI_mask_allbutself(const struct cpumask *cpumask, int vector) { }
@@ -94,7 +93,6 @@ struct apic apic_noop __ro_after_init =
.disable_esr = 0,
.check_apicid_used = default_check_apicid_used,
- .init_apic_ldr = noop_init_apic_ldr,
.ioapic_phys_id_map = default_ioapic_phys_id_map,
.setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -252,7 +252,6 @@ static const struct apic apic_numachip1
.disable_esr = 0,
.check_apicid_used = NULL,
- .init_apic_ldr = flat_init_apic_ldr,
.ioapic_phys_id_map = NULL,
.setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
@@ -297,7 +296,6 @@ static const struct apic apic_numachip2
.disable_esr = 0,
.check_apicid_used = NULL,
- .init_apic_ldr = flat_init_apic_ldr,
.ioapic_phys_id_map = NULL,
.setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -28,14 +28,6 @@ static bool bigsmp_check_apicid_used(phy
return false;
}
-/*
- * bigsmp enables physical destination mode
- * and doesn't use LDR and DFR
- */
-static void bigsmp_init_apic_ldr(void)
-{
-}
-
static void bigsmp_setup_apic_routing(void)
{
printk(KERN_INFO
@@ -108,7 +100,6 @@ static struct apic apic_bigsmp __ro_afte
.disable_esr = 1,
.check_apicid_used = bigsmp_check_apicid_used,
- .init_apic_ldr = bigsmp_init_apic_ldr,
.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,
--- a/arch/x86/kernel/apic/local.h
+++ b/arch/x86/kernel/apic/local.h
@@ -13,9 +13,6 @@
#include <asm/irq_vectors.h>
#include <asm/apic.h>
-/* APIC flat 64 */
-void flat_init_apic_ldr(void);
-
/* X2APIC */
int x2apic_apic_id_valid(u32 apicid);
int x2apic_apic_id_registered(void);
@@ -46,6 +43,8 @@ static inline unsigned int __prepare_ICR
return icr;
}
+void default_init_apic_ldr(void);
+
void __default_send_IPI_shortcut(unsigned int shortcut, int vector);
/*
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -32,21 +32,6 @@ static int default_apic_id_registered(vo
return physid_isset(read_apic_id(), phys_cpu_present_map);
}
-/*
- * Set up the logical destination ID. Intel recommends to set DFR, LDR and
- * TPR before enabling an APIC. See e.g. "AP-388 82489DX User's Manual"
- * (Intel document number 292116).
- */
-static void default_init_apic_ldr(void)
-{
- unsigned long val;
-
- apic_write(APIC_DFR, APIC_DFR_VALUE);
- val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
- val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id());
- apic_write(APIC_LDR, val);
-}
-
static int default_phys_pkg_id(int cpuid_apic, int index_msb)
{
return cpuid_apic >> index_msb;
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -91,10 +91,6 @@ static void x2apic_send_IPI_all(int vect
__x2apic_send_IPI_shorthand(vector, APIC_DEST_ALLINC);
}
-static void init_x2apic_ldr(void)
-{
-}
-
static int x2apic_phys_probe(void)
{
if (!x2apic_mode)
@@ -169,7 +165,6 @@ static struct apic apic_x2apic_phys __ro
.disable_esr = 0,
.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,
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -788,10 +788,6 @@ static int uv_apic_id_registered(void)
return 1;
}
-static void uv_init_apic_ldr(void)
-{
-}
-
static u32 apic_uv_calc_apicid(unsigned int cpu)
{
return apic_default_calc_apicid(cpu);
@@ -841,7 +837,6 @@ static struct apic apic_x2apic_uv_x __ro
.disable_esr = 0,
.check_apicid_used = NULL,
- .init_apic_ldr = uv_init_apic_ldr,
.ioapic_phys_id_map = NULL,
.setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid,
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -149,7 +149,6 @@ static struct apic xen_pv_apic = {
.disable_esr = 0,
.check_apicid_used = default_check_apicid_used, /* Used on 32-bit */
- .init_apic_ldr = xen_noop, /* setup_local_APIC calls it */
.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,
next prev parent reply other threads:[~2023-08-01 10:49 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 10:46 [patch V3 00/60] x86/apic: Decrapification and static calls Thomas Gleixner
2023-08-01 10:46 ` [patch V3 01/60] x86/cpu: Make identify_boot_cpu() static Thomas Gleixner
2023-08-01 10:46 ` [patch V3 02/60] x86/cpu: Remove unused physid_*() nonsense Thomas Gleixner
2023-08-01 10:46 ` [patch V3 03/60] x86/apic: Rename disable_apic Thomas Gleixner
2023-08-01 10:46 ` [patch V3 04/60] x86/apic/ioapic: Rename skip_ioapic_setup Thomas Gleixner
2023-08-01 10:46 ` [patch V3 05/60] x86/apic: Remove pointless x86_bios_cpu_apicid Thomas Gleixner
2023-08-01 10:46 ` [patch V3 06/60] x86/apic: Get rid of hard_smp_processor_id() Thomas Gleixner
2023-08-01 10:46 ` [patch V3 07/60] x86/apic: Remove unused max_physical_apicid Thomas Gleixner
2023-08-01 10:46 ` [patch V3 08/60] x86/apic: Nuke unused apic::inquire_remote_apic() Thomas Gleixner
2023-08-01 10:46 ` [patch V3 09/60] x86/apic: Get rid of boot_cpu_physical_apicid madness Thomas Gleixner
2023-08-01 10:46 ` [patch V3 10/60] x86/apic: Register boot CPU APIC early Thomas Gleixner
2023-08-01 10:46 ` [patch V3 11/60] x86/apic: Remove the pointless APIC version check Thomas Gleixner
2023-08-01 10:46 ` [patch V3 12/60] x86/of: Fix the APIC address registration Thomas Gleixner
2023-08-03 22:42 ` Dave Hansen
2023-08-03 23:35 ` Thomas Gleixner
2023-08-01 10:46 ` [patch V3 13/60] x86/apic: Make some APIC init functions bool Thomas Gleixner
2023-08-01 10:46 ` [patch V3 14/60] x86/apic: Split register_apic_address() Thomas Gleixner
2023-08-01 10:46 ` [patch V3 15/60] x86/apic: Sanitize APIC address setup Thomas Gleixner
2023-08-01 10:47 ` [patch V3 16/60] x86/xen/pv: Pretend that it found SMP configuration Thomas Gleixner
2023-08-01 10:47 ` [patch V3 17/60] x86/apic: Sanitize num_processors handling Thomas Gleixner
2023-08-01 10:47 ` [patch V3 18/60] x86/apic: Nuke another processor check Thomas Gleixner
2023-08-01 10:47 ` [patch V3 19/60] x86/apic: Remove check_phys_apicid_present() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 20/60] x86/apic: Get rid of apic_phys Thomas Gleixner
2023-08-01 10:47 ` [patch V3 21/60] x86/apic/32: Sanitize logical APIC ID handling Thomas Gleixner
2023-08-01 10:47 ` [patch V3 22/60] x86/apic/32: Remove x86_cpu_to_logical_apicid Thomas Gleixner
2023-08-01 10:47 ` [patch V3 23/60] x86/apic/ipi: Code cleanup Thomas Gleixner
2023-08-01 10:47 ` [patch V3 24/60] x86/apic: Mop up early_per_cpu() abuse Thomas Gleixner
2023-08-01 10:47 ` [patch V3 25/60] x86/apic/32: Remove pointless default_acpi_madt_oem_check() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 26/60] x86/apic/32: Decrapify the def_bigsmp mechanism Thomas Gleixner
2023-08-07 20:11 ` Dave Hansen
2023-08-07 21:18 ` Thomas Gleixner
2023-08-01 10:47 ` [patch V3 27/60] x86/apic/32: Remove bigsmp_cpu_present_to_apicid() Thomas Gleixner
2023-08-01 10:47 ` Thomas Gleixner [this message]
2023-08-01 10:47 ` [patch V3 29/60] x86/apic: Nuke apic::apicid_to_cpu_present() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 30/60] x86/ioapic/32: Decrapify phys_id_present_map operation Thomas Gleixner
2023-08-01 10:47 ` [patch V3 31/60] x86/apic: Mop up *setup_apic_routing() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 32/60] x86/apic: Mop up apic::apic_id_registered() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 33/60] x86/apic/ipi: Tidy up the code and fixup comments Thomas Gleixner
2023-08-01 10:47 ` [patch V3 34/60] x86/apic: Consolidate wait_icr_idle() implementations Thomas Gleixner
2023-08-01 10:47 ` [patch V3 35/60] x86/apic: Allow apic::wait_icr_idle() to be NULL Thomas Gleixner
2023-08-01 10:47 ` [patch V3 36/60] x86/apic: Allow apic::safe_wait_icr_idle() " Thomas Gleixner
2023-08-01 10:47 ` [patch V3 37/60] x86/apic: Move safe wait_icr_idle() next to apic_mem_wait_icr_idle() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 38/60] x86/apic/uv: Get rid of wrapper callbacks Thomas Gleixner
2023-08-01 10:47 ` [patch V3 39/60] x86/apic/x2apic: Share all common IPI functions Thomas Gleixner
2023-08-01 10:47 ` [patch V3 40/60] x86/apic/64: Uncopypaste probing Thomas Gleixner
2023-08-01 10:47 ` [patch V3 41/60] x86/apic: Wrap APIC ID validation into an inline Thomas Gleixner
2023-08-01 10:47 ` [patch V3 42/60] x86/apic: Add max_apic_id member Thomas Gleixner
2023-08-01 10:47 ` [patch V3 43/60] x86/apic: Simplify X2APIC ID validation Thomas Gleixner
2023-08-01 10:47 ` [patch V3 44/60] x86/apic: Prepare x2APIC for using apic::max_apic_id Thomas Gleixner
2023-08-01 10:47 ` [patch V3 45/60] x86/apic: Sanitize APID ID range validation Thomas Gleixner
2023-08-08 13:34 ` Qiuxu Zhuo
2023-08-08 18:55 ` Thomas Gleixner
2023-08-09 12:01 ` Zhang, Rui
2023-08-01 10:47 ` [patch V3 46/60] x86/apic: Remove pointless NULL initializations Thomas Gleixner
2023-08-01 10:47 ` [patch V3 47/60] x86/apic/noop: Tidy up the code Thomas Gleixner
2023-08-01 10:47 ` [patch V3 48/60] x86/apic: Remove pointless arguments from [native_]eoi_write() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 49/60] x86/apic: Nuke ack_APIC_irq() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 50/60] x86/apic: Wrap apic->native_eoi() into a helper Thomas Gleixner
2023-08-01 10:47 ` [patch V3 51/60] x86/apic: Provide common init infrastructure Thomas Gleixner
2023-08-09 1:41 ` Qiuxu Zhuo
2023-08-01 10:47 ` [patch V3 52/60] x86/xen/apic: Use standard apic driver mechanism for Xen PV Thomas Gleixner
2023-08-01 10:47 ` [patch V3 53/60] x86/apic: Provide apic_update_callback() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 54/60] x86/apic: Replace acpi_wake_cpu_handler_update() and apic_set_eoi_cb() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 55/60] x86/apic: Convert other overrides to apic_update_callback() Thomas Gleixner
2023-08-01 10:47 ` [patch V3 56/60] x86/xen/apic: Mark apic __ro_after_init Thomas Gleixner
2023-08-01 10:47 ` [patch V3 57/60] x86/apic: Mark all hotpath APIC callback wrappers __always_inline Thomas Gleixner
2023-08-01 10:47 ` [patch V3 58/60] x86/apic: Wrap IPI calls into helper functions Thomas Gleixner
2023-08-01 10:47 ` [patch V3 59/60] x86/apic: Provide static call infrastructure for APIC callbacks Thomas Gleixner
2023-08-01 10:47 ` [patch V3 60/60] x86/apic: Turn on static calls Thomas Gleixner
2023-08-02 11:55 ` [patch V3 00/60] x86/apic: Decrapification and " Juergen Gross
2023-08-03 0:05 ` Sohil Mehta
2023-08-03 3:50 ` Michael Kelley (LINUX)
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=20230801103816.692336580@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=mikelley@microsoft.com \
--cc=pbonzini@redhat.com \
--cc=peter@keresztesschmidt.de \
--cc=peterz@infradead.org \
--cc=thomas.lendacky@amd.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.