From patchwork Wed Aug 9 16:49:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 133356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2957165vqr; Wed, 9 Aug 2023 10:23:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAqS1LWLWn9aweQtW84pq1kzS+H4bgYcRf79tvcHlMPQy6Yt/rxrLxOAY3RMHtt2x8/+Rw X-Received: by 2002:a05:6a20:104a:b0:13d:bd0e:33d9 with SMTP id gt10-20020a056a20104a00b0013dbd0e33d9mr2627534pzc.47.1691601784812; Wed, 09 Aug 2023 10:23:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691601784; cv=none; d=google.com; s=arc-20160816; b=qWf/ggeIm3f7Nv/NKXmAR1DFtMw3g2QmDxCQgSSLdDkqZQdtphQQSsfORUL8y4KT6b XJrmsqZTmGu2dxVMoMTKb26DtH9CKT4Ypd/uwwe/7XTKghCaieMNvWvObIzIMwYdYucG PCNu2fptMVeKSw1YyEZES0aZ4mnM/Q4JzQnUVsz26wt0ygOTuxCz5uZQ7B8dbpBd3Wwo kDZbGTGu9/GbIllPYbC9Aj+O6RGefkWxWKrKGOAX4JNcpESbYo6GPYGTQcUqdjAkUZPz 7qp34Jwx714SsyLFrDRHHrO9yWsxFiUzqFaj/Coz7TrU9KFhjahuLOaORqt6AcGS1Zuy 5BKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=h6BxIhWomep6OoqB/tu8RGH64/FHrhfxbUDYwhu/4aw=; fh=xeBNGOuZM5vy4okdFvBNsMTGHQ6tdBlFPaNKCUScG5A=; b=UxtoCdFWDRjYgZPgLfJIJViIfzD3pGFN2r/2x5IAQnjZfMLjPsZwzw/2c3SuAE9QZv +jwiLSq7ip2bpEvZiFPTqjhAkI9FdiQ+zSwZw7DGPoA23god/kWvR7WZ2Ta0cE0vNxup M1PUcMeljuz6b+X5FkVir2pEBYTCucxS2Y8rTFC9IOsoc6eWuKVMsS0ARkpl5Pzl2we7 Trpan4Nml4YnkjNwBr5byFZ/xUesERJzcEgtTHzYpTkX4z4h+WaVzAQc390O6ENQ/rF1 C8vqja0P59v8jNxTW6ns0Yp3Tqfw0utkf2SfN/7vtfpNZcwYBo7NoP0+lqnmRgXspm1t kFFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=mWIBcl9S; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=XVgUhs6O; 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 e5-20020a656785000000b00543e355adb5si9557751pgr.294.2023.08.09.10.22.52; Wed, 09 Aug 2023 10:23:04 -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=mWIBcl9S; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=XVgUhs6O; 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 S231743AbjHIQuA (ORCPT + 99 others); Wed, 9 Aug 2023 12:50:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231365AbjHIQth (ORCPT ); Wed, 9 Aug 2023 12:49:37 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8916C1BFA; Wed, 9 Aug 2023 09:49:36 -0700 (PDT) Date: Wed, 09 Aug 2023 16:49:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691599775; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6BxIhWomep6OoqB/tu8RGH64/FHrhfxbUDYwhu/4aw=; b=mWIBcl9SaEF5bnBAiPLZ9VWPK1GNWt/iuCX95s24C4d6zWM8+M8H8GgFNjUBQilwX3lLBl w8ATH/lHvf/oy56Ox1ZI8k8kqu7NjSglG9fN+UHlIqZ8ouR8IibxkqwK99lgVqM0/0ZQgO x2toEK3SbbREbJRvShw66u7Z+WyZvVwI0s+95FmZgGQfmSyTOhbTaTEGI5xlZhES+2Dkji WOccnZzrU8mVh9SQsrohmFBCb1dcQ+xEtpJGoRArB8Uw3ea6KWXaI5z4fY6FzBmUjtfU1h a4d00aLUV+ju/7CewmFVNUzD1ksBaH5t4G/CzKEYUCT7l9itkNRI1KWljDI5bQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691599775; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6BxIhWomep6OoqB/tu8RGH64/FHrhfxbUDYwhu/4aw=; b=XVgUhs6O/vZXjZ+tHjEwbiTXWVkAuEAFvpms8yOQOPCrklBnfv8tSHtr/u/CC6tZxlS3b1 xYMfJP40om5cl3Bg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic/32: Remove bigsmp_cpu_present_to_apicid() Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169159977460.27769.11135507874065330229.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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,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: 1773773032923402539 X-GMAIL-MSGID: 1773773032923402539 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 72338b564fae8e30a16344f0d1321823db5daed6 Gitweb: https://git.kernel.org/tip/72338b564fae8e30a16344f0d1321823db5daed6 Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:03:56 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 08:10:12 -07:00 x86/apic/32: Remove bigsmp_cpu_present_to_apicid() It's a copy of default_cpu_present_to_apicid() with the omission of the actual check whether the CPU is present. This APIC callback should die completely, but the XEN APIC implementation does something different which needs to be addressed first. Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/bigsmp_32.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c index a26cb46..aba8ce1 100644 --- a/arch/x86/kernel/apic/bigsmp_32.c +++ b/arch/x86/kernel/apic/bigsmp_32.c @@ -43,14 +43,6 @@ static void bigsmp_setup_apic_routing(void) nr_ioapics); } -static int bigsmp_cpu_present_to_apicid(int mps_cpu) -{ - if (mps_cpu < nr_cpu_ids) - return (int) per_cpu(x86_cpu_to_apicid, mps_cpu); - - return BAD_APICID; -} - static void bigsmp_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap) { /* For clustered we don't have a good way to do this yet - hack */ @@ -119,7 +111,7 @@ static struct apic apic_bigsmp __ro_after_init = { .init_apic_ldr = bigsmp_init_apic_ldr, .ioapic_phys_id_map = bigsmp_ioapic_phys_id_map, .setup_apic_routing = bigsmp_setup_apic_routing, - .cpu_present_to_apicid = bigsmp_cpu_present_to_apicid, + .cpu_present_to_apicid = default_cpu_present_to_apicid, .apicid_to_cpu_present = physid_set_mask_of_physid, .phys_pkg_id = bigsmp_phys_pkg_id,