From patchwork Tue Aug 1 10:46:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129258 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2633963vqg; Tue, 1 Aug 2023 05:30:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlFpKjbXkNzXPor5k0AnFeQaceITWT7SoZJ5hvBCedwsvxV5QY/c489FhjgUpmRg5WfGiBIi X-Received: by 2002:a05:6a21:6811:b0:13d:ea25:9642 with SMTP id wr17-20020a056a21681100b0013dea259642mr4144449pzb.6.1690893047524; Tue, 01 Aug 2023 05:30:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690893047; cv=none; d=google.com; s=arc-20160816; b=oQUWffKmG7ec21UNGpNMQuQp0wScCawJtActXwPcTnuQRPx1eVWT6wYHhWngaONza7 76rJjs0jCzPjmE73NrR4ahLluvmAhRgVlgZBDW3y0JarlWkejJGUeOBBvPUKR4HImIdn M9oQIPMP42eLpFvaDOIJ0OhxhbY3px30p7w9drQtq7IqXNUhH4s7MVXnlaWHWbLF6grv fHpBtfxQiJgCP+NP47u2Nw4+FtnIBziqtt6s73e+ln6DKpYrYz47FY2ZXJvZnGbODT6A H7qQZpsB8dpdV0a9uDHfELVvTa1RrLycc076lY7R04d2aphpx4mGV6vvg8dixVSAcafC iJQA== 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=EJkw3wmb0xhqWNonEGYegw1kbsCG+7tuReZsQsrarng=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=rnqWZAyhCvrRv7hT8qlquD75SCIsB0NEf/5m4PjC/DsgMb3lRBdc5a7krnNgkdWxvJ SZ3/R/vflCjKHivkt+XkxLaBvouSBVdX6Whzo9fcdNB3FFeLQkJDk9OUH5kEgf2DAdNm vG7aQMPZ8tqwrX60AqjiR5ixhQ7gXf+eZE315eDMDfg+Tv5/D+/J/fIniGOBq6/efmGw xO7YeEp9iO4KT7/W4HJdOOkafaFEfurAvcXrCTGlzKqkREKyVexKCfpwa/3nCgi+u2HJ RkTxYQsbbOp4v8SEYTfZbeNiqbgXAcJFssXa7h15f8DJm5iXwYStxfWhnzJJ9nc1e2ui 6VVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=EDNg7MUM; dkim=neutral (no key) header.i=@linutronix.de header.b=u8G9h4g0; 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 m21-20020a056a00081500b006875398611csi541200pfk.80.2023.08.01.05.30.32; Tue, 01 Aug 2023 05:30:47 -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=EDNg7MUM; dkim=neutral (no key) header.i=@linutronix.de header.b=u8G9h4g0; 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 S233610AbjHAKrt (ORCPT + 99 others); Tue, 1 Aug 2023 06:47:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233582AbjHAKrF (ORCPT ); Tue, 1 Aug 2023 06:47:05 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5F9BE5C for ; Tue, 1 Aug 2023 03:47:00 -0700 (PDT) Message-ID: <20230801103815.927989749@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690886818; 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=EJkw3wmb0xhqWNonEGYegw1kbsCG+7tuReZsQsrarng=; b=EDNg7MUMxkWgPHgZUAro7549ueqK237B6jax7erstsq6P9g2AiA9vyAEBQvxt4IbNGpNTC 3Vc1Wb1LMRYQMlGOu5zvWHvY54yK0W8MXOjD3tWaQk1gfAI5AsWBXOWwbREouXU4uKiLf3 /YLaEqki/y0PKMFhskgcy9l/tyd/UybtjhuUvF7r2kn8zMwPdpl8ZCDF04eD7Rg3BfzjrU jVoLkLhHOBI5Bek5J88We4zFEcx7RK9vxb48sHFuc+vF8gdnDdg3fzblqPK8bR8VUztuyE 0W9l69TWclesYL4z56evQZaAeSDIURaKkeAmqWoZIQs9Xs9nQJYpY9RFNmUjtA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690886818; 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=EJkw3wmb0xhqWNonEGYegw1kbsCG+7tuReZsQsrarng=; b=u8G9h4g0Ze769QRkXmduC9mOPnQO93TsMo8Tu7hEaveDB5G9gNuqxTxYogShNgfhELF6Yl e5dkbXlT+zKt4FDg== 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 14/60] x86/apic: Split register_apic_address() References: <20230801103042.936020332@linutronix.de> MIME-Version: 1.0 Date: Tue, 1 Aug 2023 12:46:58 +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: 1773029868376111906 X-GMAIL-MSGID: 1773029868376111906 Split the fixmap setup out of register_lapic_address() and reuse it when the X2APIC is disabled during setup. This avoids that the APIC ID is registered twice. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/apic.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1852,6 +1852,8 @@ void x2apic_setup(void) __x2apic_enable(); } +static __init void apic_set_fixmap(void); + static __init void x2apic_disable(void) { u32 x2apic_id, state = x2apic_state; @@ -1872,7 +1874,7 @@ static __init void x2apic_disable(void) } __x2apic_disable(); - register_lapic_address(mp_lapic_addr); + apic_set_fixmap(); } static __init void x2apic_enable(void) @@ -2145,17 +2147,21 @@ void __init init_apic_mappings(void) } } +static __init void apic_set_fixmap(void) +{ + set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr); + apic_mmio_base = APIC_BASE; + apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", + apic_mmio_base, mp_lapic_addr); + apic_read_boot_cpu_id(false); +} + void __init register_lapic_address(unsigned long address) { mp_lapic_addr = address; - if (x2apic_mode) - return; - - set_fixmap_nocache(FIX_APIC_BASE, address); - apic_mmio_base = APIC_BASE; - apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", APIC_BASE, address); - apic_read_boot_cpu_id(false); + if (!x2apic_mode) + apic_set_fixmap(); } /*