Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 268d17ab authored by Pu Wen's avatar Pu Wen Committed by Greg Kroah-Hartman
Browse files

x86/cpu/hygon: Fix the CPU topology evaluation for real 



commit ee545b94d39a00c93dc98b1dbcbcf731d2eadeb4 upstream.

Hygon processors with a model ID > 3 have CPUID leaf 0xB correctly
populated and don't need the fixed package ID shift workaround. The fixup
is also incorrect when running in a guest.

Fixes: e0ceeae7 ("x86/CPU/hygon: Fix phys_proc_id calculation logic for multi-die processors")
Signed-off-by: default avatarPu Wen <puwen@hygon.cn>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/tencent_594804A808BD93A4EBF50A994F228E3A7F07@qq.com
Link: https://lore.kernel.org/r/20230814085112.089607918@linutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent acbc12b0

arch/x86/kernel/cpu/hygon.c

+6 −2
Original line number Diff line number Diff line
@@ -88,7 +88,11 @@ static void hygon_get_topology(struct cpuinfo_x86 *c) 
		if (!err)

			c->x86_coreid_bits = get_count_order(c->x86_max_cores);



		/* Socket ID is ApicId[6] for these processors. */

		/*

		 * Socket ID is ApicId[6] for the processors with model <= 0x3

		 * when running on host.

		 */

		if (!boot_cpu_has(X86_FEATURE_HYPERVISOR) && c->x86_model <= 0x3)

			c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;



		cacheinfo_hygon_init_llc_id(c, cpu);