From patchwork Mon Jul 24 17:44:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 125141 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1969276vqg; Mon, 24 Jul 2023 11:12:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlHZOYWIiW8qdDBcGHrMVa1t0EF8IHn5eOGRS+TyNWZsFO6KUBVaMOpnKuYwTU0jNWTMFGNV X-Received: by 2002:a17:906:518e:b0:994:9ed:300b with SMTP id y14-20020a170906518e00b0099409ed300bmr10965251ejk.16.1690222374245; Mon, 24 Jul 2023 11:12:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690222374; cv=none; d=google.com; s=arc-20160816; b=UkvoZZfKLUYXbdE+PQfy8h5sypTL8s+YjtDmveo1hCNq+UM0jQxe1cOZKmrPEJGbv8 u1gm+X5pnF76fh23ksLJalvaUkHjhGY+FNz9HSSgV/fCdZrcApPzAicODkaW5b2hhzUc R0LQqIM0gw0ui1dpU/gg/zYZiV2uBRRFQgFbQkHLjqSHg+WzttlHdlwNNpekaGBy5wW4 eVTEaaI8XxBGSuj1IxyrvnhBcJWM48Wj3g5LKwuWvbMPrkWOVVmHlsEhif53AoIyWobd dokQV5AmUSAcFMWpoyCjHUMi42Gw5i0MHR5dj/tJgoJU60keLOzj2C9zVAhJ7TZk7dSz Dp7w== 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=R30kgmHCGWHq0zLlNoJY82eQjQTUWAtGppL/g8UfpDM=; fh=cDlgSYzM/IiVZ/EC06yL1+GD3+pSK8bXSWGje/Xzf2k=; b=Us0Qf9IowMaKGCLGB9Y0Ww+VzoHZ0elEjdvflobo8zPtwFV94Y3VVNgT/2vm57Oxci FXZimtuurZx4p8+TfbH7czzuJk69Y3iDVc4myeaOYjCp35CvgqUB0CHteaHBG/Dnxmil kyi6Trv3ut9AWKl0wjyH4MRub9dokqXtp1npjpyhEKfYv4Tb4LbpYtyi2DdXZz6aHdgw Xmc/0KjTZqja8aVtqukkfCRJB8r0nP/6KKx6nNUcnUdab7uImjPeMKvmcwQbSo9WKnRm GywmIzRBAHX9OZX5ELf1ANYgjHDljnyKrcO5oJ+2p9kf1PquzJYABdzzSGPlCmz00qw8 BOow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=xusIPNMr; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=7H4yd3qV; 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 qu6-20020a170907110600b0098e4aef0789si6972430ejb.613.2023.07.24.11.12.29; Mon, 24 Jul 2023 11:12:54 -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=xusIPNMr; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=7H4yd3qV; 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 S231176AbjGXRqR (ORCPT + 99 others); Mon, 24 Jul 2023 13:46:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbjGXRpX (ORCPT ); Mon, 24 Jul 2023 13:45:23 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE9001FF7; Mon, 24 Jul 2023 10:44:18 -0700 (PDT) Message-ID: <20230724172844.631464270@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690220656; 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=R30kgmHCGWHq0zLlNoJY82eQjQTUWAtGppL/g8UfpDM=; b=xusIPNMrsSpPxMX7Avb7S0L9JXepWrpXcOfYKwGAUpQyN91U68gBk9FtQuIKz21tkEapzE HJyrb7isB74dHo3/784UKqfnInxY7HONp9PFxunx4dg+gkTcfB6P1sWwEEdy8eApaLYNxL Md74SUr8Sp9hO132cYnd+m06SsEf835bjM5EQ1ILltvgGp5b8HtB0a+yrTvtWxe2n8nJtU 4NTbhyBjeiywURUYb0pc7KSu7HLrqFxABfPoukMVFtVu6HklQ0S/QzCnUJVD3LLx2bhJ7p LEVyQiX3di53yC3LdNMb+iB3qy5UQIlL7Vwkm1KVqpqaFEFWO43PLQ7rtkyMJw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690220656; 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=R30kgmHCGWHq0zLlNoJY82eQjQTUWAtGppL/g8UfpDM=; b=7H4yd3qVc4czF5nq59Jzu0N1ThwbjKezF5j8xeJGLO0zAKEMa3+P5h2nqM+hU/G+Tz+BhB 0hGUQ5LoMDO57SCw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , "James E.J. Bottomley" , Dick Kennedy , James Smart , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-hwmon@vger.kernel.org, Jean Delvare , Huang Rui , Guenter Roeck , Steve Wahl , Mike Travis , Dimitri Sivanich , Russ Anderson Subject: [patch 16/29] x86/cpu: Move __max_die_per_package to common.c References: <20230724155329.474037902@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 19:44:15 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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: 1772326616365568590 X-GMAIL-MSGID: 1772326616365568590 In preparation of a complete replacement for the topology leaf 0xb/0x1f evaluation, move __max_die_per_package into the common code. Will be removed once everything is converted over. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/common.c | 3 +++ arch/x86/kernel/cpu/topology.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -75,6 +75,9 @@ u32 elf_hwcap2 __read_mostly; int smp_num_siblings = 1; EXPORT_SYMBOL(smp_num_siblings); +unsigned int __max_die_per_package __read_mostly = 1; +EXPORT_SYMBOL(__max_die_per_package); + static struct ppin_info { int feature; int msr_ppin_ctl; --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -25,9 +25,6 @@ #define BITS_SHIFT_NEXT_LEVEL(eax) ((eax) & 0x1f) #define LEVEL_MAX_SIBLINGS(ebx) ((ebx) & 0xffff) -unsigned int __max_die_per_package __read_mostly = 1; -EXPORT_SYMBOL(__max_die_per_package); - #ifdef CONFIG_SMP /* * Check if given CPUID extended topology "leaf" is implemented