[tip: x86/cpu] x86/cpu/hygon: Set __max_die_per_package on Hygon
From: tip-bot2 for Pu Wen
Date: Tue Mar 02 2021 - 13:09:22 EST
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 191d799ecaca4d5c7f87c624ae36581237ab8a87
Gitweb: https://git.kernel.org/tip/191d799ecaca4d5c7f87c624ae36581237ab8a87
Author: Pu Wen <puwen@xxxxxxxx>
AuthorDate: Tue, 02 Mar 2021 10:02:17 +08:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Tue, 02 Mar 2021 15:57:39 +01:00
x86/cpu/hygon: Set __max_die_per_package on Hygon
Set the maximum DIE per package variable on Hygon using the
nodes_per_socket value in order to do per-DIE manipulations for drivers
such as powercap.
Signed-off-by: Pu Wen <puwen@xxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20210302020217.1827-1-puwen@xxxxxxxx
---
arch/x86/kernel/cpu/hygon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/hygon.c b/arch/x86/kernel/cpu/hygon.c
index ae59115..0bd6c74 100644
--- a/arch/x86/kernel/cpu/hygon.c
+++ b/arch/x86/kernel/cpu/hygon.c
@@ -215,12 +215,12 @@ static void bsp_init_hygon(struct cpuinfo_x86 *c)
u32 ecx;
ecx = cpuid_ecx(0x8000001e);
- nodes_per_socket = ((ecx >> 8) & 7) + 1;
+ __max_die_per_package = nodes_per_socket = ((ecx >> 8) & 7) + 1;
} else if (boot_cpu_has(X86_FEATURE_NODEID_MSR)) {
u64 value;
rdmsrl(MSR_FAM10H_NODE_ID, value);
- nodes_per_socket = ((value >> 3) & 7) + 1;
+ __max_die_per_package = nodes_per_socket = ((value >> 3) & 7) + 1;
}
if (!boot_cpu_has(X86_FEATURE_AMD_SSBD) &&