From nobody Fri Sep 12 03:04:03 2025 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 BDAC0C001DE for ; Wed, 9 Aug 2023 19:13:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233257AbjHITNm (ORCPT ); Wed, 9 Aug 2023 15:13:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232152AbjHITM7 (ORCPT ); Wed, 9 Aug 2023 15:12:59 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B58F5210B; Wed, 9 Aug 2023 12:12:36 -0700 (PDT) Date: Wed, 09 Aug 2023 19:12:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691608345; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZOOnlytwjdniYUrv8HLfKwwBshoQq0BLjDC3lVUi74U=; b=aM8go1BW0LBb2/TPETRHj/3sN/Az2fBDIIJ8NIg3mQvLg0XVSGLqIu9pZcV6e7Pf8hJpNo 4SP0VjTB3vKcr2aNdax/pLjMTqMG9K2SzpqnNgMFXOsHLG7GhnS4VJ4f/v898WTgqHLj90 /tmkacAKkrKW3yUSbdw3XaMiK/oa6Qqgin0tJQuNusINWBhuUpEWtMfDdXuIESh3uJ+c7j h+VBTBQFut0auN4ndodihoULfcuOKuid4rVFkIPPFJYgTGMQXXfl7lSKFzlTRkBSiRywal Gxh/qIKESVoSHQ7p1gbIyUmZnOaeCsS8VZRQn15B3o9Oxc4088wGy+4GuLxtKA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691608345; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZOOnlytwjdniYUrv8HLfKwwBshoQq0BLjDC3lVUi74U=; b=XnLhBDbIbJE2aj+MS6VHOZHIKmUfeWPrBbuEtpzn+pgJa8Q9Q6wUWTnI+KiT/8+GFi7ktY UatcB0R9hknw6KAQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic: Make some APIC init functions bool Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , Michael Kelley , Sohil Mehta , Juergen Gross , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169160834490.27769.7553485649731661081.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/apic branch of tip: Commit-ID: 1751adedbd601d6a9da35de0c1e2592ac980fdfe Gitweb: https://git.kernel.org/tip/1751adedbd601d6a9da35de0c1e2592ac= 980fdfe Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:03:48 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 11:58:20 -07:00 x86/apic: Make some APIC init functions bool Quite some APIC init functions are pure boolean, but use the success =3D 0, fail < 0 model. That's confusing as hell when reading through the code. Convert them to boolean. Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) Tested-by: Michael Kelley Tested-by: Sohil Mehta Tested-by: Juergen Gross # Xen PV (dom0 and unpriv. guest) --- 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(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 108fdc2..35d236b 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -135,12 +135,12 @@ extern void setup_secondary_APIC_clock(void); extern void lapic_update_tsc_freq(void); =20 #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 =20 extern void apic_ap_setup(void); diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 32275ca..d0f4cca 100644 --- 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; } =20 mp_lapic_addr =3D APIC_DEFAULT_PHYS_BASE; - return 0; + return true; } #else =20 -static int __init apic_verify(void) +static bool __init apic_verify(void) { u32 features, h, l; =20 @@ -2023,7 +2023,7 @@ static int __init apic_verify(void) features =3D 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 =3D APIC_DEFAULT_PHYS_BASE; @@ -2036,15 +2036,15 @@ static int __init apic_verify(void) } =20 pr_info("Found and enabled local APIC!\n"); - return 0; + return true; } =20 -int __init apic_force_enable(unsigned long addr) +bool __init apic_force_enable(unsigned long addr) { u32 h, l; =20 if (apic_is_disabled) - return -1; + return false; =20 /* * Some BIOSes disable the local APIC in the APIC_BASE @@ -2067,11 +2067,11 @@ int __init apic_force_enable(unsigned long addr) /* * 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; =20 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; } =20 apic_pm_activate(); =20 - return 0; + return true; =20 no_apic: pr_info("No local APIC present or hardware disabled\n"); - return -1; + return false; } #endif =20 @@ -2129,7 +2129,7 @@ void __init init_apic_mappings(void) return; =20 /* 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(); diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 8f94eb6..87d38f1 100644 --- 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);