diff --git a/arch/x86/kernel/cpu/hygon.c b/arch/x86/kernel/cpu/hygon.c
index 55c4db713cd5416310b3406aafa0305d08ac5e2a..aba60d96ed6d5bd0399110956c20b470e0b885e5 100644
--- a/arch/x86/kernel/cpu/hygon.c
+++ b/arch/x86/kernel/cpu/hygon.c
@@ -81,16 +81,11 @@ static void hygon_get_topology(struct cpuinfo_x86 *c)
 		if (smp_num_siblings > 1)
 			c->x86_max_cores /= smp_num_siblings;
 
-		switch (c->x86_model) {
-		case 0x0 ... 0x3:
-			if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
-				break;
+		if (c->x86 == 0x18 && c->x86_model < 0x4 &&
+		    !boot_cpu_has(X86_FEATURE_HYPERVISOR)) {
 			/* Socket ID is ApicId[6] for these processors. */
 			c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;
-			break;
-		case 0x4:
-		case 0x5:
-		case 0x6:
+		} else {
 			/*
 			 * In case leaf 0xB is available, use it to derive
 			 * topology information.
@@ -100,9 +95,6 @@ static void hygon_get_topology(struct cpuinfo_x86 *c)
 				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);