From patchwork Mon Jul 17 23:14:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 121649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1399537vqt; Mon, 17 Jul 2023 16:18:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlEG/mgnYItnuPqGXE/jZ7VtDVzareOscK9K1kP/pZs5aa86CxNKUT2Co7FwqsiG68FORJfK X-Received: by 2002:a17:906:14e:b0:992:5399:2543 with SMTP id 14-20020a170906014e00b0099253992543mr12158579ejh.30.1689635899974; Mon, 17 Jul 2023 16:18:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689635899; cv=none; d=google.com; s=arc-20160816; b=U/LF1emRk+pLNtIq3u9yFuP9PT3nrPxwoAGkG1uWvkz8ZSymZ2zjgsk1V2UB232nfe DjmZ5wNZfXWKSjU3TYQX1PK3NKq8IaBpmrE2+bxg+gPaZb1Bo/zRphg9cxMKjvMkQ2GI MJuhiD/hIvSDPhMl/GdqQ1eArzwvVfSddk1qa2mivy3RPB2+0dRRsDw2PTCI+ick0Wbi FsYy8b5sfoynM2XViHhpOvp78lZ2kV0nUZm6+4ZhdK/zmJwcVUfB0EdeDfEGDqhWUilp RbmI+OFbJhQOw3/YLdfssu6xV/F5gou1N2JxQWf4fEWRuH/Aoi2ZyAOJu5rgRP/EU2A3 BLtg== 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=6lsXOSCdebUCwT7n6zhHvn8DJi5YZlZjkDwKMSiOzL0=; fh=MJzvnywV9/WrN/ASipmGkNx/7jKFHnq83nsgXe/obdc=; b=wBUrMSErFW4KX49bncOMmIweIEFKiP9lpGH69Qd38DrcLf/pfxiFqrchdfDpr3trmQ dwvt6/EVCmVRzQrrMTY2riZ5uD80BNc66W5tsPnWN6RrV5VE9xAYVBQFz7e7Mr+q5qKG JhK+38F3osf3+BfBIwGMnWMJh5mBJa9Mk2fxpDSFEXDYOs9QmSwuO9/n10QZ0TKaJmNR v4LKoKN8t0SnS3Wz8NK7x1dbGMLTsYChbKCB0VMB2Q6sqOcsYm5l2PqUTF9tqpj1ajgX va/lIJJHvBmADfFsiWsBQbGUG/s6/JYE1VioUwYZC6zRorjQMRhKeuRjn5LRpV2ol/tO Ai0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MXEXcw0t; dkim=neutral (no key) header.i=@linutronix.de; 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 t9-20020a170906064900b00992dcae843esi292467ejb.202.2023.07.17.16.17.56; Mon, 17 Jul 2023 16:18:19 -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=MXEXcw0t; dkim=neutral (no key) header.i=@linutronix.de; 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 S231368AbjGQXPk (ORCPT + 99 others); Mon, 17 Jul 2023 19:15:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231316AbjGQXP1 (ORCPT ); Mon, 17 Jul 2023 19:15:27 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6585B173B for ; Mon, 17 Jul 2023 16:14:58 -0700 (PDT) Message-ID: <20230717223223.913161388@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689635696; 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=6lsXOSCdebUCwT7n6zhHvn8DJi5YZlZjkDwKMSiOzL0=; b=MXEXcw0tO5uqiDRsXTnO1WBHMsD/0ClTumSqTLX7DyN70nfu5/fdzzOhrzzHZveO4r1D6b 6oFfLSbK9kF08uQuLICNty1yodyumD3rKz9EfI1n6JlwYTnhRbYjPmjljqGX88Fpw6La/A IfOhKQHwTm4IMWL9cXEE2SV8Oud65buCZfMODG/e15uAOUkuas3ZVUryW2B8WNTWnC2Stl l21SnNLcNOUFeL3EoBv9UMs5smQlqxLC6U0Vt8nUWuPCE7I6TslCptB5rm3FY2B8Lu5SSw IJdpheAGkEm4JBZDXY9EzzzUCRWQSdGzg476eSlIl9BHbbmZCowo7t8utmrO+A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689635696; 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=6lsXOSCdebUCwT7n6zhHvn8DJi5YZlZjkDwKMSiOzL0=; b=7Y5AMRjCRyDwmGRaUhRVIFOHgb79/2tewqVXhnRTQVeAcdD8zj38cRXDrd1JXiGD518QaE KdXPf7Sd90IYV3CQ== 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 14/58] x86/apic: Split register_apic_address() References: <20230717223049.327865981@linutronix.de> MIME-Version: 1.0 Date: Tue, 18 Jul 2023 01:14:55 +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: 1771711653583742846 X-GMAIL-MSGID: 1771711653583742846 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 --- 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(); } /*