From patchwork Mon Jul 17 23:14:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 121648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1399467vqt; Mon, 17 Jul 2023 16:18:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlGtDyTf6Rkh+ETtn6n4VRB7GHA99LsGfi/koI4OnW6dNrCN+43BvCc2Ioa67buLT0j9lcFe X-Received: by 2002:a17:906:64d6:b0:97e:56d5:b885 with SMTP id p22-20020a17090664d600b0097e56d5b885mr11710020ejn.60.1689635892886; Mon, 17 Jul 2023 16:18:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689635892; cv=none; d=google.com; s=arc-20160816; b=lULpJrZeUpEKYF94nvNFGYsNCcvFK8jWJlcGKcmHO5g1IZCxVI/9KU0qkFED6X3mJx pkSa+k+DID8mECfyBE2LM58OMzDn9ba4D28S4DgNgSHqfrC/AwBcis/laNjyUHiAGc+h FqGQkIp1SVfE2A19vR2CrmvUIsh1SnRg4rPhLv7JOsj368vEIOAxlxLlWEr1vLmi7Hf9 QcYc9kyFlelsm/RVFCe23jEjoliL/EDx0pHyvKvut2oSz4mAD51ofpqgP4NBFxym9Ht8 A5fjZ5rEd8h0u44uNk4oZxuf2DpWC1nCtGEYASRO89uefX4qwikSQVwoWpCzs9JlYb6+ BRaA== 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=oO9hcqnpNwvqYXrZ+6Z6cARd5ofqbuQWYypUIdXUUcI=; fh=MJzvnywV9/WrN/ASipmGkNx/7jKFHnq83nsgXe/obdc=; b=GubwsQe0C5uryLRJTQLbcSyc42YoV/lW2UQPZ7qYJzjcVmPSYyASfaSo5T2lrhuOP5 q8K51ZmkTwZbdtzG1D0kbYYvkp5YbRiMgB2QuUxRLsFYsuSfTTfvm2q6gIa7KysDTQOf MtwiYY4WqfBpgB9fGXXnVlLo65oypWzMaJn/gRhcgkbEAs1nx9UxYJIVqKyAO3jTNyKZ xa08zTm6lnaO69xquFKeHPWxXE+NpOtszjifq1DkV3/+waV4596Q4ZVETrtngbth2z/M j7dATMN5pVvwtIt5/uGgYOU1NN++N0oSByy1P1FiuGvxMBoYKQ1hhy/THI/Pz+oHebiA pF2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="p7b6/Bis"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=wZpkUn2c; 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 lr23-20020a170906fb9700b00997124ebc83si341066ejb.6.2023.07.17.16.17.50; Mon, 17 Jul 2023 16:18:12 -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="p7b6/Bis"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=wZpkUn2c; 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 S231294AbjGQXPZ (ORCPT + 99 others); Mon, 17 Jul 2023 19:15:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231311AbjGQXPM (ORCPT ); Mon, 17 Jul 2023 19:15:12 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D24A170F for ; Mon, 17 Jul 2023 16:14:55 -0700 (PDT) Message-ID: <20230717223223.795705685@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689635693; 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=oO9hcqnpNwvqYXrZ+6Z6cARd5ofqbuQWYypUIdXUUcI=; b=p7b6/Bis4eXvJ7P7OK19N8ZEt+C+dp7pjK1yD7IFcMFEtxgTJl/IOBgPbh/NH6/bVPfEtC Czqqoyll9VnvOxtEJyIjAvCu4MvMRESmDb0VPpLkAh0kOdiMOzcyseAr5qz64QkYxsuW6E Df1ytueO2TeawBnB7AQ4SjbREIiyOtCkPaJORc7Lzi6T3dcXVJTtZV0oDnovkz1SOoNb4S iFSvOFBCbL0BCHi2YBAeI7UCunfSMds2s06ogGyPWe3Dgiyf5hm35WtNp4HeqwIDD5sUtk 5qg7YT2NCTcZSIeekDKkhG0NriDLzT0xxBrLR0FbUF22dUH4d4y2B/Gg5pcy5w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689635693; 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=oO9hcqnpNwvqYXrZ+6Z6cARd5ofqbuQWYypUIdXUUcI=; b=wZpkUn2cRMrRvmnxKnBieim+IVSwk2CPB0K19234yqR5v4qeFA6mJIP/kDNHpMJXAyyovl 53nr1vAHeDKHfzAw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Linus Torvalds , Andrew Cooper , Tom Lendacky , Paolo Bonzini , Wei Liu , Arjan van de Ven , Juergen Gross Subject: [patch 12/58] x86/of: Fix the APIC address registration References: <20230717223049.327865981@linutronix.de> MIME-Version: 1.0 Date: Tue, 18 Jul 2023 01:14:52 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: 1771711646185630073 X-GMAIL-MSGID: 1771711646185630073 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 --- 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 */