Unverified Commit f3d2858e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3311 Add support for Hygon model 4h CPU topology 

Merge Pull Request from: @hygoner 
 
Update the CPU topology for Hygon family 18h model 4h+ processors.

Reference:
https://gitee.com/openeuler/kernel/pulls/1638
https://gitee.com/openeuler/kernel/pulls/1531
https://gitee.com/openeuler/kernel/pulls/1565 
 
Link:https://gitee.com/openeuler/kernel/pulls/3311

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 4cc7ff7f 8876406e

arch/x86/kernel/cpu/hygon.c

+4 −2
Original line number Diff line number Diff line
@@ -80,12 +80,14 @@ static void hygon_get_topology(struct cpuinfo_x86 *c) 
			c->x86_max_cores /= smp_num_siblings;



		/*

		 * In case leaf B is available, use it to derive

		 * From model 0x4, leaf B is available, so use it to derive

		 * topology information.

		 */

		err = detect_extended_topology(c);

		if (!err)

		if (!err) {

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

			__max_die_per_package = nodes_per_socket;

		}



		/*

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