Skip to contentSkip to conversation

x86/cpu/amd: Set __max_die_per_package on AMD

PATCH New Borislav Petkov 1 participant 1 message Jan 11, 2021 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/cpu/amd: Set __max_die_per_package on AMD

From: Yazen Ghannam <[email protected]>

Set the maximum DIE per package variable on AMD using the NodesPerProcessor topology value. This will be used by RAPL, among others, to determine the maximum number of DIEs on the system in order to do per-DIE manipulations.

[ bp: Productize into a proper patch. ]

Fixes 028c221ed190 ("x86/CPU/AMD: Save AMD NodeId as cpu_die_id")
Reported-by Johnathan Smithinovic <[email protected]>
Reported-by Rafael Kitover <[email protected]>
Signed-off-by Yazen Ghannam <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Tested-by Johnathan Smithinovic <[email protected]>
Tested-by Rafael Kitover <[email protected]>
Link https://bugzilla.kernel.org/show_bug.cgi?id=210939
---
 arch/x86/kernel/cpu/amd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/amd.c +2 -2
index f8ca66f3d861..347a956f71ca 100644
@@ -542,12 +542,12 @@ static void bsp_init_amd(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) &&
Signature · 1 line
2.29.2