From patchwork Tue Aug 1 10:46:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2644990vqg; Tue, 1 Aug 2023 05:52:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlGUoOmAMppPIGtv+NEocNEeZO97Qyu8KzthIpQGAKfHbqZSiw5/kjElI8lHer1Xo22mXboN X-Received: by 2002:a17:906:151:b0:99b:5689:1331 with SMTP id 17-20020a170906015100b0099b56891331mr2551108ejh.59.1690894330746; Tue, 01 Aug 2023 05:52:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690894330; cv=none; d=google.com; s=arc-20160816; b=lI1ygxGzGuTv6AUwUbqEfHeQtRXmWlsD0sxO6uGUCIpt9xNoe3niKSM1gK0eis1KNa gcrzpExm7KFRfsMt3ijSs6mv4jHpWvs/JxPN6PCmIKuKZEAfI8vEJtfDOwfH51wocPCL 4kdCymK72Ki3E3H5pLe2hOGNTWXrZ6mxurJGQowty0wxc43oQdB7QAz73QJAcwl88ctG pKWZywaMMdd1UXfqwyPoE1MxKcwCcK6kT2HQJKU+0eDkmw4YgxiedbVnnn404yDJopI8 t7x/KO8eQuxVS3WUH4SY+rppzstWYvlB9kRpuO7lr7Ih1apLSlXy+YwTY7neBvrfW8ZU GoTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=0iz4gOQLk9YymQJzW0sXfBIS7q8+WXoqEL26ZlioJL4=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=Ps2D5ahCK8FKRddaXYdmiZpSnVbm79ax4AJGjcIZrrF/Ik4SOrbHuJuP0RGdfCbdiM Q3ImgxrAbzRpOzXaQEpLsO5NtoRhJbJH8hvkAhvd62aFVyYfMLwLirF5yR10El//HOjB ZDSF09BjJlSQOWAiDyGIitb5ZwOv47rFp2K129JlYRSc01ICOYFXBxupriauiwD5LwxH t1QoZ024qDVRKgaLnEpMXKSruRtGVBWeUAydCSYDAqxWYifhCv+aEvYgfy13SOMBhguR Gu7h7WHQmnmVXXVKM0Sy5/glqhL5QfEJ9mBAaKBWlk6eg5fQnoJDkGe2KieQCH53GMUs NVdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xHfj3Ew1; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="i/RHiBUZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u22-20020a1709060b1600b0099bd5b27329si8549484ejg.523.2023.08.01.05.51.45; Tue, 01 Aug 2023 05:52:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xHfj3Ew1; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="i/RHiBUZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233997AbjHAKrj (ORCPT + 99 others); Tue, 1 Aug 2023 06:47:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233481AbjHAKrC (ORCPT ); Tue, 1 Aug 2023 06:47:02 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51BAE2110 for ; Tue, 1 Aug 2023 03:46:58 -0700 (PDT) Message-ID: <20230801103815.818545643@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690886816; 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=0iz4gOQLk9YymQJzW0sXfBIS7q8+WXoqEL26ZlioJL4=; b=xHfj3Ew1Yfp+Xqbj7e4eEVWNpZs6jPQwoH7rDreB7MWpFzWI4Eb+94HPs+2QQvg1SNex3e LUdfKxlc459j381mPw7h4xbwlHCiJeb7KcklVppzqNWaeuT4MGk6O/ex0nq+BrKOZVbMAb QAYVZAmDd/gkCAq9y2e/IbWba/UQrVySWk0BgXsSEq1Mx2u9yNimZWa1WL2JNq9z4z+pS6 zh3SbLqLxld4eKkswvW+Q9YHftBtp4oY57kZWvE/W1Rtljfwe8wZpsG4iiXZ2h+qCcg+xL N1yJp3djA5h2IX5GEPztsM/t2bcJWEN5+nJKOlfws3xdXk3PXJLVHt98GylTDQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690886816; 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=0iz4gOQLk9YymQJzW0sXfBIS7q8+WXoqEL26ZlioJL4=; b=i/RHiBUZXMIBJq5wLGL9/QaOS+tQvhKnvbAXPFNIeih8x/8IKk0Tpj8TkIUkf/+yIuKPgz Btqre1SxqulJZ3Cw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Andrew Cooper , Tom Lendacky , Paolo Bonzini , Wei Liu , Arjan van de Ven , Juergen Gross , Michael Kelley , Peter Keresztes Schmidt , "Peter Zijlstra (Intel)" Subject: [patch V3 12/60] x86/of: Fix the APIC address registration References: <20230801103042.936020332@linutronix.de> MIME-Version: 1.0 Date: Tue, 1 Aug 2023 12:46:56 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773031213823258846 X-GMAIL-MSGID: 1773031213823258846 The device tree APIC parser tries to force enable the local APIC when it is not set in CPUID. apic_force_enable() registers the boot CPU apic on success. If that succeeds then dtb_lapic_setup() registers the local APIC again eventually with a different address. Rewrite the code so that it only registers it once. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/devicetree.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -157,19 +157,15 @@ 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)) return; - } - smp_found_config = 1; - if (of_property_read_bool(dn, "intel,virtual-wire-mode")) { - pr_info("Virtual Wire compatibility mode.\n"); - pic_mode = 0; } else { - pr_info("IMCR and PIC compatibility mode.\n"); - pic_mode = 1; + register_lapic_address(lapic_addr); } - - register_lapic_address(lapic_addr); + smp_found_config = 1; + pic_mode = !of_property_read_bool(dn, "intel,virtual-wire-mode"); + pr_info("%s compatibility mode.\n", pic_mode ? "IMCR and PIC" : "Virtual Wire"); } #endif /* CONFIG_X86_LOCAL_APIC */