Commit 59eca2fa authored by Pu Wen's avatar Pu Wen Committed by Ingo Molnar
Browse files

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: default avatarPu Wen <puwen@hygon.cn>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20210302020217.1827-1-puwen@hygon.cn
parent a38fd874

arch/x86/kernel/cpu/hygon.c

+2 −2
Original line number Diff line number Diff line
@@ -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) &&