From patchwork Mon Jul 24 13:34:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 124958 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1805324vqg; Mon, 24 Jul 2023 06:37:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlH193pTAPkf2TQivcw0pv5+Z6/ztJuXb/idwFmCRdF0cdpfLyzx9ddENPPDtWCqQaE88SUG X-Received: by 2002:a05:6a20:12d3:b0:12f:bc36:4c67 with SMTP id v19-20020a056a2012d300b0012fbc364c67mr13915516pzg.61.1690205835049; Mon, 24 Jul 2023 06:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690205835; cv=none; d=google.com; s=arc-20160816; b=ltLXnwMiVTKqJ5NV+6OpmX3SPAT0zMlpbwGu23QAmJS6L9EhxqcGkFD7z/2WD/Osbq 1lAgfQNQ+jd4sMCIKo2HyFS/DoXPbPMV5MesSFUx8sF0CfVPBSMJ9dDed+rJiLMFrHw6 2f0XM6Nwg07+29YcAezgXgh36IvNXuq25rrkED2XRsY/abS/aOEu2ckoUz1vjt80LP+1 r/aZzWNr4ekayl0hI4LIshTn2WgNriVIf+cvdvPGCqMApXFtoCMCSuWrC43advUXIaOl ntysGnP77y1CuxQHneVZUH2lIPOnsRAW74Z44ytA/14Lz0uVPzikfxwS+GRGHgKSndqn 0IkA== 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=vOJoQpnpN7d3eV6HeUuI+p0lGBlXXGH3sKendJmYzNLEJbRhsRJuT0oXG72IGGaoZ7 cSPcI+mj3K4D5Fv36914O2+QKYJIoc2QObH8fmxXeF5qrGTYt7FRl7U93e6OlcSFHN7V BJcA1Ghj4QDFKUTbtK73nTOPnlJ6vj2ZWny1PdfiyUPStSRkig4/9h1KVwpZY5cr92ke 12WGNs1m1wX6b7mABX+nbU+Z1aPiSATVqTIJRMfmnPw0Dl07gc02AEOwqHfH7iLeRkqd zMDgiN0b/+Ewbc3p2l7obK1vBXX/Q0yU8RULqfFTy0FHGuVKGCi695uJMB/GUPPGaAd1 j7Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Kyiv3T1j; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 u15-20020a056a00124f00b0065ee6c40f91si9161728pfi.159.2023.07.24.06.37.01; Mon, 24 Jul 2023 06:37:15 -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=Kyiv3T1j; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S231670AbjGXNe4 (ORCPT + 99 others); Mon, 24 Jul 2023 09:34:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231599AbjGXNec (ORCPT ); Mon, 24 Jul 2023 09:34:32 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A79B51BF1 for ; Mon, 24 Jul 2023 06:34:10 -0700 (PDT) Message-ID: <20230724132045.434855520@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690205648; 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=Kyiv3T1joglVmzf6J56J1lTfa+Jalt2vb2QpjzFy/28THUaEiuQVpcgvUdLUiAV8p4MWhE bH4GgH0YGoO6nUuiXr3vhkv5Mu0PX+orFE+7gslHVsUkNr87zS37uzoydhgEPhIA3HaiRB GCyg3+jVZSOh0bYoKYGK6gCblPwSG/es5vv7IyMDGlWovMOM3/6u76NoNUCdcOvZrNQ3b/ JbPGHRsTL3GaUl5DAx5YXQY10kdh7vastronQsdO4K2FDADbaNjjco0SGMB0SEe2wROZOC C0I92gH8usC92EJTjHYtFcWTq17KKBizs5s9xKHrsVXRO5UFgKrumBScIO5Q6w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690205648; 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=YAdf/YGLep1yAK7cFLYNYVlMFi9OoBc3sTKs1TjW/NIly0HoutTMn0Y+8cnEao5C4hn3N3 Pi3WaC7HU5wg5AAw== 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 V2 14/58] x86/apic: Split register_apic_address() References: <20230724131206.500814398@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 15:34:08 +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: 1772309273471837029 X-GMAIL-MSGID: 1772309273471837029 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(); } /*