diff --git a/arch/x86/kernel/cpu/hygon.c b/arch/x86/kernel/cpu/hygon.c
index 0c14650fc034..0196de7638fa 100644
--- a/arch/x86/kernel/cpu/hygon.c
+++ b/arch/x86/kernel/cpu/hygon.c
@@ -80,16 +80,27 @@ static void hygon_get_topology(struct cpuinfo_x86 *c)
 		if (smp_num_siblings > 1)
 			c->x86_max_cores /= smp_num_siblings;
 
-		/*
-		 * In case leaf B is available, use it to derive
-		 * topology information.
-		 */
-		err = detect_extended_topology(c);
-		if (!err)
-			c->x86_coreid_bits = get_count_order(c->x86_max_cores);
-
-		/* Socket ID is ApicId[6] for these processors. */
-		c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;
+		switch (c->x86_model) {
+		case 0x0 ... 0x3:
+			if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
+				break;
+			/* Socket ID is ApicId[6] for these processors. */
+			c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;
+			break;
+		case 0x4:
+			/*
+			 * In case leaf 0xB is available, use it to derive
+			 * topology information.
+			 */
+			err = detect_extended_topology(c);
+			if (!err)
+				c->x86_coreid_bits =
+					get_count_order(c->x86_max_cores);
+			__max_die_per_package = nodes_per_socket;
+			break;
+		default:
+			break;
+		}
 
 		cacheinfo_hygon_init_llc_id(c, cpu);
 	} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {