From patchwork Mon Jul 24 13:34:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 124986 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1812911vqg; Mon, 24 Jul 2023 06:50:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlFHSx78AcbXKda0iDyIkIGUGIi1bMJ2K+i3L4ccW/406EPXZ8dfBfd5wjag4s8f5kuKI0Oz X-Received: by 2002:a17:906:9bc6:b0:982:26c5:6525 with SMTP id de6-20020a1709069bc600b0098226c56525mr9320686ejc.60.1690206643385; Mon, 24 Jul 2023 06:50:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690206643; cv=none; d=google.com; s=arc-20160816; b=pIT9LEI48MS4cBCL/vOc9nfNqieU5buqH+9kzhXFKC+Z3JTsRDgrgxNMK2M/vs2PnF hNG14Q1NRuYfP5UR9hgjUFjc7btYaAN9F40GGmkxUc9RKARIjBfNWp0WWuqm0wVkl6ti Xhk3rAw0oNq8vcgN0BeH7os697jKad1fcpHtN7AMkAae8NJNMdUIqY16VIDLzUzMQ2lI Z5HgNudbnbKP1FzYIsJwpYxoFRonkDA6fFlWRjWC+XtVA5w/5z6JEX3j0muz1chI6AJ+ 2aBUjJ8kP6Ut28PjyP/c3ZrtPOT2LOajInwbyat3kq3lYr8cJF1u/b5tx99qsPsIPShZ C4Rg== 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=XhABCxwHPGY7DF2UNzN4o5WpsX1JegdIqFCLm4OuXKU=; fh=mE3iieUIZLcDfOLIULj9X6/p0bMDPZGFSVRsnyRUnTc=; b=gk2KjWmgHBFrRE1M63jhXY/aR2D+7ozQOLUnpIEj62csQnT/HhBXOU6iSNb/rhMcEk 0qIPF2RzU50LUH0YeODugotonNbzwRWsFDxIVXInBKAVvp99TUPh9wQYhserCFLiwzXI LogdS8OhvyL2ruVKLfRFAtXucfbv8YoHb3FO5dsys13qMJ10cTc9t72ycxQ+Apgpqf/p wZZJDjF5qkltiHEv8sM3l7tN4vrwpQWqX3k7TB32lZ+/O//V5hsBs+m4/F2Nhc4SXgA2 aqSgVrvqkESmz0aISNj5kdwM31mqG8BySWl0heBsYVXojEkYZhWpbup94cSrJf7rr0js GKYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VmGFX0IE; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=JLNG2RMx; 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 w25-20020a1709064a1900b009933309250bsi6367469eju.64.2023.07.24.06.50.17; Mon, 24 Jul 2023 06:50:43 -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=VmGFX0IE; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=JLNG2RMx; 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 S231657AbjGXNgk (ORCPT + 99 others); Mon, 24 Jul 2023 09:36:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231650AbjGXNf5 (ORCPT ); Mon, 24 Jul 2023 09:35:57 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37CD12137 for ; Mon, 24 Jul 2023 06:35:22 -0700 (PDT) Message-ID: <20230724132046.151776137@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690205669; 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=XhABCxwHPGY7DF2UNzN4o5WpsX1JegdIqFCLm4OuXKU=; b=VmGFX0IETpaI+oMlGGJY0qeaNZGdonnmAPfFKwcvA3qmYDCTS+ALu/+/KRMhq6fMo+WS9q jCMBnPbJRiA+oUMNpXiLmAOR+HMPx+QDdiSmzRliAliGe2H1sO7Jfh/PNfAV4SUkCLqIwm MrGm3Tb202qfpETcj4lZDuUAIGUpeZXbo6WhOnaaq3Af92X/htMabWpVs0YzWVdZ48XNUj k9nvdneoMFge9u7TFPcCSJ6b5TyO8RfOR/jl/Sb3HMCrjbr7yEQb5ZMnzfVLOFXwfzAFfN 6OY4m+JrdV3KMqhSE4TaMbxowurGrXUPIK7HDGFuInFpiro76JUjyhC9W9SspA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690205669; 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=XhABCxwHPGY7DF2UNzN4o5WpsX1JegdIqFCLm4OuXKU=; b=JLNG2RMxRe+mb+bVZfwm+s9yCPeHqUjtHLAPxX0yNcYmbs1VO5qzGqByHvHBmvOz3+Vb+q 2KqpNUQqi+OLldAg== 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 26/58] x86/apic/32: Remove bigsmp_cpu_present_to_apicid() References: <20230724131206.500814398@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 15:34:28 +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: 1772310121538738612 X-GMAIL-MSGID: 1772310121538738612 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 Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/bigsmp_32.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) --- 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(vo 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_afte .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,