diff mbox series

[v2,24/38] x86/cpu: Move __max_die_per_package to common.c

Message ID	20230728120931.007571739@linutronix.de (mailing list archive)
State	Not Applicable
Headers	show Return-Path: <linux-scsi-owner@vger.kernel.org> Message-ID: <20230728120931.007571739@linutronix.de> From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: x86@kernel.org, Tom Lendacky <thomas.lendacky@amd.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Arjan van de Ven <arjan@linux.intel.com>, "James E.J. Bottomley" <jejb@linux.ibm.com>, Dick Kennedy <dick.kennedy@broadcom.com>, James Smart <james.smart@broadcom.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, linux-scsi@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>, linux-hwmon@vger.kernel.org, Jean Delvare <jdelvare@suse.com>, Huang Rui <ray.huang@amd.com>, Juergen Gross <jgross@suse.com>, Steve Wahl <steve.wahl@hpe.com>, Mike Travis <mike.travis@hpe.com>, Dimitri Sivanich <dimitri.sivanich@hpe.com>, Russ Anderson <russ.anderson@hpe.com> Subject: [patch v2 24/38] x86/cpu: Move __max_die_per_package to common.c References: <20230728105650.565799744@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Fri, 28 Jul 2023 14:13:12 +0200 (CEST) Precedence: bulk
Series	x86/cpu: Rework the topology evaluation \| expand [v2,00/38] x86/cpu: Rework the topology evaluation [v2,01/38] x86/cpu: Encapsulate topology information in cpuinfo_x86 [v2,02/38] x86/cpu: Move phys_proc_id into topology info [v2,03/38] x86/cpu: Move cpu_die_id into topology info [v2,04/38] scsi: lpfc: Use topology_core_id() [v2,05/38] hwmon: (fam15h_power) Use topology_core_id() [v2,06/38] x86/cpu: Move cpu_core_id into topology info [v2,07/38] x86/cpu: Move cu_id into topology info [v2,08/38] x86/cpu: Remove pointless evaluation of x86_coreid_bits [v2,09/38] x86/cpu: Move logical package and die IDs into topology info [v2,10/38] x86/cpu: Move cpu_l[l2]c_id into topology info [v2,11/38] x86/apic: Use BAD_APICID consistently; [v2,12/38] x86/apic: Use u32 for APIC IDs in global data [v2,13/38] x86/apic: Use u32 for check_apicid_used() [v2,14/38] x86/apic: Use u32 for cpu_present_to_apicid() [v2,15/38] x86/apic: Use u32 for phys_pkg_id() [v2,16/38] x86/apic: Use u32 for [gs]et_apic_id() [v2,17/38] x86/apic: Use u32 for wakeup_secondary_cpu[_64]() [v2,18/38] x86/cpu/topology: Cure the abuse of cpuinfo for persisting logical ids [v2,19/38] x86/cpu: Provide debug interface [v2,20/38] x86/cpu: Provide cpuid_read() et al. [v2,21/38] x86/cpu: Provide cpu_init/parse_topology() [v2,22/38] x86/cpu: Add legacy topology parser [v2,23/38] x86/cpu: Use common topology code for Centaur and Zhaoxin [v2,24/38] x86/cpu: Move __max_die_per_package to common.c [v2,25/38] x86/cpu: Provide a sane leaf 0xb/0x1f parser [v2,26/38] x86/cpu: Use common topology code for Intel [v2,27/38] x86/cpu/amd: Provide a separate acessor for Node ID [v2,28/38] x86/cpu: Provide an AMD/HYGON specific topology parser [v2,29/38] x86/smpboot: Teach it about topo.amd_node_id [v2,30/38] x86/cpu: Use common topology code for AMD [v2,31/38] x86/cpu: Use common topology code for HYGON [v2,32/38] x86/mm/numa: Use core domain size on AMD [v2,33/38] x86/cpu: Make topology_amd_node_id() use the actual node info [v2,34/38] x86/cpu: Remove topology.c [v2,35/38] x86/cpu: Remove x86_coreid_bits [v2,36/38] x86/apic: Remove unused phys_pkg_id() callback [v2,37/38] x86/xen/smp_pv: Remove cpudata fiddling [v2,38/38] x86/apic/uv: Remove the private leaf 0xb parser

Commit Message

Thomas Gleixner July 28, 2023, 12:13 p.m. UTC

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 <tglx@linutronix.de>
---
 arch/x86/kernel/cpu/common.c   |    3 +++
 arch/x86/kernel/cpu/topology.c |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

--- 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