From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Juergen Gross <jgross@suse.com>,
Sohil Mehta <sohil.mehta@intel.com>,
Michael Kelley <mhklinux@outlook.com>,
Zhang Rui <rui.zhang@intel.com>,
Wang Wendy <wendy.wang@intel.com>,
K Prateek Nayak <kprateek.nayak@amd.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/apic] x86/cpu: Move __max_die_per_package to common.c
Date: Fri, 16 Feb 2024 15:17:33 -0000 [thread overview]
Message-ID: <170809665374.398.4261415306130047095.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240212153624.768188958@linutronix.de>
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: 92853a7774f942e3692dbd83bace82333a2b47bd
Gitweb: https://git.kernel.org/tip/92853a7774f942e3692dbd83bace82333a2b47bd
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Tue, 13 Feb 2024 22:04:05 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 15 Feb 2024 22:07:37 +01:00
x86/cpu: Move __max_die_per_package to common.c
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>
Tested-by: Juergen Gross <jgross@suse.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Tested-by: Michael Kelley <mhklinux@outlook.com>
Tested-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Wang Wendy <wendy.wang@intel.com>
Tested-by: K Prateek Nayak <kprateek.nayak@amd.com>
Link: https://lore.kernel.org/r/20240212153624.768188958@linutronix.de
---
arch/x86/kernel/cpu/common.c | 3 +++
arch/x86/kernel/cpu/topology.c | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 004ae9c..5d7911f 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -76,6 +76,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;
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
index dc13670..208e17a 100644
--- 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
next prev parent reply other threads:[~2024-02-16 15:17 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 21:03 [patch V6 00/19] x86/cpu: Rework topology evaluation Thomas Gleixner
2024-02-13 21:04 ` [patch V6 01/19] x86/cpu: Provide cpuid_read() et al Thomas Gleixner
2024-02-13 21:36 ` Borislav Petkov
2024-02-13 23:32 ` Thomas Gleixner
2024-02-14 20:29 ` [patch V6a " Thomas Gleixner
2024-02-15 8:49 ` Andy Shevchenko
2024-02-15 15:07 ` Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 02/19] x86/cpu: Provide cpu_init/parse_topology() Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 03/19] x86/cpu: Add legacy topology parser Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 04/19] x86/cpu: Use common topology code for Centaur and Zhaoxin Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 05/19] x86/cpu: Move __max_die_per_package to common.c Thomas Gleixner
2024-02-16 15:17 ` tip-bot2 for Thomas Gleixner [this message]
2024-02-13 21:04 ` [patch V6 06/19] x86/cpu: Provide a sane leaf 0xb/0x1f parser Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 07/19] x86/cpu: Use common topology code for Intel Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 08/19] x86/cpu/amd: Provide a separate accessor for Node ID Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 09/19] x86/cpu: Provide an AMD/HYGON specific topology parser Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 10/19] x86/smpboot: Teach it about topo.amd_node_id Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 11/19] x86/cpu: Use common topology code for AMD Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 12/19] x86/cpu: Use common topology code for HYGON Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 13/19] x86/mm/numa: Use core domain size on AMD Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 14/19] x86/cpu: Make topology_amd_node_id() use the actual node info Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 15/19] x86/cpu: Remove topology.c Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 16/19] x86/cpu: Remove x86_coreid_bits Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 17/19] x86/apic: Remove unused phys_pkg_id() callback Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 18/19] x86/xen/smp_pv: Remove cpudata fiddling Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-13 21:04 ` [patch V6 19/19] x86/apic/uv: Remove the private leaf 0xb parser Thomas Gleixner
2024-02-16 15:17 ` [tip: x86/apic] " tip-bot2 for Thomas Gleixner
2024-02-15 16:24 ` [patch V6 00/19] x86/cpu: Rework topology evaluation K Prateek Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=170809665374.398.4261415306130047095.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jgross@suse.com \
--cc=kprateek.nayak@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mhklinux@outlook.com \
--cc=rui.zhang@intel.com \
--cc=sohil.mehta@intel.com \
--cc=tglx@linutronix.de \
--cc=wendy.wang@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®