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 V2 13/58] x86/apic: Make some APIC init functions bool
Date: Mon, 24 Jul 2023 15:34:06 +0200 (CEST) [thread overview]
Message-ID: <20230724132045.361461564@linutronix.de> (raw)
In-Reply-To: <20230724131206.500814398@linutronix.de>
Quite some APIC init functions are pure boolean, but use the success = 0,
fail < 0 model. That's confusing as hell when reading through the code.
Convert them to boolean.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/include/asm/apic.h | 6 +++---
arch/x86/kernel/apic/apic.c | 36 ++++++++++++++++++------------------
arch/x86/kernel/devicetree.c | 2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -135,12 +135,12 @@ extern void setup_secondary_APIC_clock(v
extern void lapic_update_tsc_freq(void);
#ifdef CONFIG_X86_64
-static inline int apic_force_enable(unsigned long addr)
+static inline bool apic_force_enable(unsigned long addr)
{
- return -1;
+ return false;
}
#else
-extern int apic_force_enable(unsigned long addr);
+extern bool apic_force_enable(unsigned long addr);
#endif
extern void apic_ap_setup(void);
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2000,19 +2000,19 @@ void __init enable_IR_x2apic(void)
* On AMD64 we trust the BIOS - if it says no APIC it is likely
* not correctly set up (usually the APIC timer won't work etc.)
*/
-static int __init detect_init_APIC(void)
+static bool __init detect_init_APIC(void)
{
if (!boot_cpu_has(X86_FEATURE_APIC)) {
pr_info("No local APIC present\n");
- return -1;
+ return false;
}
mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
- return 0;
+ return true;
}
#else
-static int __init apic_verify(void)
+static bool __init apic_verify(void)
{
u32 features, h, l;
@@ -2023,7 +2023,7 @@ static int __init apic_verify(void)
features = cpuid_edx(1);
if (!(features & (1 << X86_FEATURE_APIC))) {
pr_warn("Could not enable APIC!\n");
- return -1;
+ return false;
}
set_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
@@ -2036,15 +2036,15 @@ static int __init apic_verify(void)
}
pr_info("Found and enabled local APIC!\n");
- return 0;
+ return true;
}
-int __init apic_force_enable(unsigned long addr)
+bool __init apic_force_enable(unsigned long addr)
{
u32 h, l;
if (apic_is_disabled)
- return -1;
+ return false;
/*
* Some BIOSes disable the local APIC in the APIC_BASE
@@ -2067,11 +2067,11 @@ int __init apic_force_enable(unsigned lo
/*
* Detect and initialize APIC
*/
-static int __init detect_init_APIC(void)
+static bool __init detect_init_APIC(void)
{
/* Disabled by kernel option? */
if (apic_is_disabled)
- return -1;
+ return false;
switch (boot_cpu_data.x86_vendor) {
case X86_VENDOR_AMD:
@@ -2098,22 +2098,22 @@ static int __init detect_init_APIC(void)
if (!force_enable_local_apic) {
pr_info("Local APIC disabled by BIOS -- "
"you can enable it with \"lapic\"\n");
- return -1;
+ return false;
}
- if (apic_force_enable(APIC_DEFAULT_PHYS_BASE))
- return -1;
+ if (!apic_force_enable(APIC_DEFAULT_PHYS_BASE))
+ return false;
} else {
- if (apic_verify())
- return -1;
+ if (!apic_verify())
+ return false;
}
apic_pm_activate();
- return 0;
+ return true;
no_apic:
pr_info("No local APIC present or hardware disabled\n");
- return -1;
+ return false;
}
#endif
@@ -2129,7 +2129,7 @@ void __init init_apic_mappings(void)
return;
/* If no local APIC can be found return early */
- if (!smp_found_config && detect_init_APIC()) {
+ if (!smp_found_config && !detect_init_APIC()) {
/* lets NOP'ify apic operations */
pr_info("APIC: disable apic facility\n");
apic_disable();
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -158,7 +158,7 @@ static void __init dtb_lapic_setup(void)
/* Did the boot loader setup the local APIC ? */
if (!boot_cpu_has(X86_FEATURE_APIC)) {
/* Try force enabling, which registers the APIC address */
- if (apic_force_enable(lapic_addr))
+ if (!apic_force_enable(lapic_addr))
return;
} else {
register_lapic_address(lapic_addr);
next prev parent reply other threads:[~2023-07-24 13:34 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-24 13:33 [patch V2 00/58] x86/apic: Decrapification and static calls Thomas Gleixner
2023-07-24 13:33 ` [patch V2 01/58] x86/cpu: Make identify_boot_cpu() static Thomas Gleixner
2023-07-24 13:33 ` [patch V2 02/58] x86/cpu: Remove unused physid_*() nonsense Thomas Gleixner
2023-07-24 13:33 ` [patch V2 03/58] x86/apic: Rename disable_apic Thomas Gleixner
2023-07-24 13:33 ` [patch V2 04/58] x86/apic/ioapic: Rename skip_ioapic_setup Thomas Gleixner
2023-07-24 13:33 ` [patch V2 05/58] x86/apic: Remove pointless x86_bios_cpu_apicid Thomas Gleixner
2023-07-24 13:33 ` [patch V2 06/58] x86/apic: Get rid of hard_smp_processor_id() Thomas Gleixner
2023-07-24 13:33 ` [patch V2 07/58] x86/apic: Remove unused max_physical_apicid Thomas Gleixner
2023-07-24 13:33 ` [patch V2 08/58] x86/apic: Nuke unused apic::inquire_remote_apic() Thomas Gleixner
2023-07-24 13:33 ` [patch V2 09/58] x86/apic: Get rid of boot_cpu_physical_apicid madness Thomas Gleixner
2023-07-24 13:34 ` [patch V2 10/58] x86/apic: Register boot CPU APIC early Thomas Gleixner
2023-07-24 13:34 ` [patch V2 11/58] x86/apic: Remove the pointless APIC version check Thomas Gleixner
2023-07-24 13:34 ` [patch V2 12/58] x86/of: Fix the APIC address registration Thomas Gleixner
2023-07-24 13:34 ` Thomas Gleixner [this message]
2023-07-24 13:34 ` [patch V2 14/58] x86/apic: Split register_apic_address() Thomas Gleixner
2023-07-24 13:34 ` [patch V2 15/58] x86/apic: Sanitize APIC address setup Thomas Gleixner
2023-07-24 13:34 ` [patch V2 16/58] x86/apic: Sanitize num_processors handling Thomas Gleixner
2023-07-31 10:17 ` Juergen Gross
2023-07-31 12:50 ` Thomas Gleixner
2023-07-31 15:57 ` Thomas Gleixner
2023-07-31 18:19 ` Juergen Gross
2023-08-01 6:12 ` Juergen Gross
2023-07-24 13:34 ` [patch V2 17/58] x86/apic: Nuke another processor check Thomas Gleixner
2023-07-24 13:34 ` [patch V2 18/58] x86/apic: Remove check_phys_apicid_present() Thomas Gleixner
2023-07-24 13:34 ` [patch V2 19/58] x86/apic: Get rid of apic_phys Thomas Gleixner
2023-07-24 13:34 ` [patch V2 20/58] x86/apic/32: Sanitize logical APIC ID handling Thomas Gleixner
2023-07-24 13:34 ` [patch V2 21/58] x86/apic/32: Remove x86_cpu_to_logical_apicid Thomas Gleixner
2023-07-24 13:34 ` [patch V2 22/58] x86/apic/ipi: Code cleanup Thomas Gleixner
2023-07-24 13:34 ` [patch V2 23/58] x86/apic: Mop up early_per_cpu() abuse Thomas Gleixner
2023-07-24 13:34 ` [patch V2 24/58] x86/apic/32: Remove pointless default_acpi_madt_oem_check() Thomas Gleixner
2023-07-24 13:34 ` [patch V2 25/58] x86/apic/32: Decrapify the def_bigsmp mechanism Thomas Gleixner
2023-07-24 13:34 ` [patch V2 26/58] x86/apic/32: Remove bigsmp_cpu_present_to_apicid() Thomas Gleixner
2023-07-24 13:34 ` [patch V2 27/58] x86/apic: Nuke empty init_apic_ldr() callbacks Thomas Gleixner
2023-07-24 13:34 ` [patch V2 28/58] x86/apic: Nuke apic::apicid_to_cpu_present() Thomas Gleixner
2023-07-24 13:34 ` [patch V2 29/58] x86/ioapic/32: Decrapify phys_id_present_map operation Thomas Gleixner
2023-07-24 13:34 ` [patch V2 30/58] x86/apic: Mop up *setup_apic_routing() Thomas Gleixner
2023-07-24 13:34 ` [patch V2 31/58] x86/apic: Mop up apic::apic_id_registered() Thomas Gleixner
2023-07-24 13:34 ` [patch V2 32/58] x86/apic/ipi: Tidy up the code and fixup comments Thomas Gleixner
2023-07-24 13:34 ` [patch V2 33/58] x86/apic: Consolidate wait_icr_idle() implementations Thomas Gleixner
2023-07-24 13:34 ` [patch V2 34/58] x86/apic: Allow apic::wait_icr_idle() to be NULL Thomas Gleixner
2023-07-24 13:34 ` [patch V2 35/58] x86/apic: Allow apic::safe_wait_icr_idle() " Thomas Gleixner
2023-07-24 13:34 ` [patch V2 36/58] x86/apic: Move safe wait_icr_idle() next to apic_mem_wait_icr_idle() Thomas Gleixner
2023-07-24 13:34 ` [patch V2 37/58] x86/apic/uv: Get rid of wrapper callbacks Thomas Gleixner
2023-07-24 13:34 ` [patch V2 38/58] x86/apic/x2apic: Share all common IPI functions Thomas Gleixner
2023-07-24 13:34 ` [patch V2 39/58] x86/apic/64: Uncopypaste probing Thomas Gleixner
2023-07-24 13:34 ` [patch V2 40/58] x86/apic: Wrap APIC ID validation into an inline Thomas Gleixner
2023-07-24 13:34 ` [patch V2 41/58] x86/apic: Add max_apic_id member Thomas Gleixner
2023-07-24 13:34 ` [patch V2 42/58] x86/apic: Simplify X2APIC ID validation Thomas Gleixner
2023-07-24 13:34 ` [patch V2 43/58] x86/apic: Prepare x2APIC for using apic::max_apic_id Thomas Gleixner
2023-07-24 13:35 ` [patch V2 44/58] x86/apic: Sanitize APID ID range validation Thomas Gleixner
2023-07-24 13:35 ` [patch V2 45/58] x86/apic: Remove pointless NULL initializations Thomas Gleixner
2023-07-24 13:35 ` [patch V2 46/58] x86/apic/noop: Tidy up the code Thomas Gleixner
2023-07-24 13:35 ` [patch V2 47/58] x86/apic: Remove pointless arguments from [native_]eoi_write() Thomas Gleixner
2023-07-24 13:35 ` [patch V2 48/58] x86/apic: Nuke ack_APIC_irq() Thomas Gleixner
2023-07-24 13:35 ` [patch V2 49/58] x86/apic: Wrap apic->native_eoi() into a helper Thomas Gleixner
2023-07-24 13:35 ` [patch V2 50/58] x86/apic: Provide common init infrastructure Thomas Gleixner
2023-07-31 11:31 ` Juergen Gross
2023-07-31 13:01 ` Thomas Gleixner
2023-07-31 13:10 ` Juergen Gross
2023-07-31 15:48 ` Thomas Gleixner
2023-08-01 6:41 ` Thomas Gleixner
2023-08-01 6:49 ` Juergen Gross
2023-08-01 7:08 ` Juergen Gross
2023-08-01 7:32 ` Thomas Gleixner
2023-08-01 7:37 ` Juergen Gross
2023-08-01 8:23 ` Thomas Gleixner
2023-08-01 8:25 ` Juergen Gross
2023-08-01 8:54 ` Thomas Gleixner
2023-08-01 8:59 ` Juergen Gross
2023-08-09 20:36 ` [tip: x86/apic] x86/xen/apic: Use standard apic driver mechanism for Xen PV tip-bot2 for Juergen Gross
2023-08-01 7:30 ` [patch V2 50/58] x86/apic: Provide common init infrastructure Thomas Gleixner
2023-07-24 13:35 ` [patch V2 51/58] x86/apic: Provide apic_update_callback() Thomas Gleixner
2023-07-24 13:35 ` [patch V2 52/58] x86/apic: Replace acpi_wake_cpu_handler_update() and apic_set_eoi_cb() Thomas Gleixner
2023-07-24 13:35 ` [patch V2 53/58] x86/apic: Convert other overrides to apic_update_callback() Thomas Gleixner
2023-07-24 13:35 ` [patch V2 54/58] x86/xen/apic: Mark apic __ro_after_init Thomas Gleixner
2023-07-24 13:35 ` [patch V2 55/58] x86/apic: Mark all hotpath APIC callback wrappers __always_inline Thomas Gleixner
2023-07-24 13:35 ` [patch V2 56/58] x86/apic: Wrap IPI calls into helper functions Thomas Gleixner
2023-07-24 13:35 ` [patch V2 57/58] x86/apic: Provide static call infrastructure for APIC callbacks Thomas Gleixner
2023-07-24 13:35 ` [patch V2 58/58] x86/apic: Turn on static calls Thomas Gleixner
2023-07-25 0:40 ` [patch V2 00/58] x86/apic: Decrapification and " Sohil Mehta
2023-07-31 12:20 ` Juergen Gross
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=20230724132045.361461564@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®