From patchwork Mon Jul 24 13:34:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 124985 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1812827vqg; Mon, 24 Jul 2023 06:50:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlHhz+DGgAlN99/27nwGYtC+duAj411uSDXh3nYvUKN7PvtP08v8SISVB0B+SII+3HCBIX/Q X-Received: by 2002:aa7:ce0a:0:b0:522:3081:ddba with SMTP id d10-20020aa7ce0a000000b005223081ddbamr2007307edv.15.1690206634392; Mon, 24 Jul 2023 06:50:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690206634; cv=none; d=google.com; s=arc-20160816; b=ynpAY2GNCGq5l5A0b3eUjlN7Sv4MVnwMn01VMuC53RtnYyzq93A1MYe385QnMajixT 3sNjF1jGbosj6rpgEBpsgkbNG0od8CLe2KtJI7QBnX9zM3PVXCMJzfpr03tPlKLlR5Bz ov+0afTK7ekp53SRaOWga98xxMm8nVq69cqOjrVAlHil0sLFTnNnuKb0rMDDQ5cl0+DO UnSRlpAqCJkH0cldA4ZROOWuEOY5/HgWV5tuUzz0fGeRXYUe2fF2q8/t+k/bMSjlEtEj wVRYC4r923B1B5beki7tNIuRAqvyPCKBxxpVt3F9F1bgsYJFEhADSi5S9x9s+v1OYXrX 9psQ== 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=BfaXC6qRGr8XWK4LjXyteInjeXWpDiNfshAXINVsujg=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=QH6APz2X8hYLvXReOB6PItLlaJI8aHwjyD8Q4LSjYp326V43K3ClloSIML+/E0M7lN t9quusS/dPz69w0ZdsdbxATbvsaCeSzJpwKWfh6Smly3yM6NZM47ujSlOM8y9gbMP/72 mcHuMDJuUytuFLYa/MxsIxrC12VMwkyjLunR9lnpr1GxPsd0v9Y34WtG+xrsMbzw39mF YSHSXhgQ15ta68uzW+BhzjwlnIzisNz/IlvGhhVfGg19IRMR65Bf9g/xV1GzjU4WXaFj R0Rk9OXKTlro7ZG/sA5QrRPvOgJQMQxcimt01wYIrCeFdWpfizniiEnq1oRdW5agJAhG YNkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=rBrBgPj4; 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 y12-20020aa7c24c000000b005222b230f04si1789390edo.218.2023.07.24.06.50.09; Mon, 24 Jul 2023 06:50:34 -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=rBrBgPj4; 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 S229590AbjGXNhC (ORCPT + 99 others); Mon, 24 Jul 2023 09:37:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231675AbjGXNgO (ORCPT ); Mon, 24 Jul 2023 09:36:14 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCF2AE57 for ; Mon, 24 Jul 2023 06:35:29 -0700 (PDT) Message-ID: <20230724132046.914636320@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690205692; 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=BfaXC6qRGr8XWK4LjXyteInjeXWpDiNfshAXINVsujg=; b=rBrBgPj4xEhKB5OhAKW3pKBeR22chHFszUB89FHDzDmmkDolz+dnpaCWcZ1gqFy7q0nyHo v3p539z+InJZl5ZcR7w2jARYFrnT4+ZYh1JxIu8Ju3uII8pNk3NzE8zzYiivONcX/eQLSF cnIjIUWrhQylRShC//xtYj+URn9Of8UztO0r9G60kG6qfiquF/3L7CUL1QkTa+nhZGDGOd q/nI4ghUEpH5R0DbhiFSiMVorz8jp1ZiUTDrbleL/zJUJbWeRWffkkoLn6VclcDSelKsgb 6cCNBs98X/QWjN+D3rjKyrJfhDdTl7mmCmAUm1eNqIGCnFcuqRXZtcDjb+9uqw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690205692; 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=BfaXC6qRGr8XWK4LjXyteInjeXWpDiNfshAXINVsujg=; b=ucjjb286RnMg6oNahVJ2kVDAMuUObBCOefXstNcdp+cdlwXF53ylY6NnTN+bhYqR/wPYal WdjLBfqB0nc87NCA== 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 39/58] x86/apic/64: Uncopypaste probing References: <20230724131206.500814398@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 15:34:51 +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: 1772310111661884370 X-GMAIL-MSGID: 1772310111661884370 No need for the same thing twice. Also prepares for simplifying the APIC ID validation checks. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/probe_64.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) --- a/arch/x86/kernel/apic/probe_64.c +++ b/arch/x86/kernel/apic/probe_64.c @@ -13,6 +13,15 @@ #include "local.h" +static __init void apic_install_driver(struct apic *driver) +{ + if (apic == driver) + return; + + apic = driver; + pr_info("Switched APIC routing to %s:\n", apic->name); +} + /* Select the appropriate APIC driver */ void __init x86_64_probe_apic(void) { @@ -22,11 +31,7 @@ void __init x86_64_probe_apic(void) for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) { if ((*drv)->probe && (*drv)->probe()) { - if (apic != *drv) { - apic = *drv; - pr_info("Switched APIC routing to %s.\n", - apic->name); - } + apic_install_driver(*drv); break; } } @@ -38,11 +43,7 @@ int __init default_acpi_madt_oem_check(c for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) { if ((*drv)->acpi_madt_oem_check(oem_id, oem_table_id)) { - if (apic != *drv) { - apic = *drv; - pr_info("Setting APIC routing to %s.\n", - apic->name); - } + apic_install_driver(*drv); return 1; } }