diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index 2d7840ea0743f2afc47c10b2afa66c39b6fb1068..7804fade31c260b9d91be60b5c4bbedc1805de7d 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -242,10 +242,8 @@ static int amd_uncore_event_init(struct perf_event *event)
 		if (boot_cpu_data.x86_model == 0x4 ||
 		    boot_cpu_data.x86_model == 0x5)
 			event_mask = HYGON_F18H_M4H_RAW_EVENT_MASK_NB;
-		if (boot_cpu_data.x86_model == 0x6 ||
-		    boot_cpu_data.x86_model == 0x7 ||
-		    boot_cpu_data.x86_model == 0x8 ||
-		    boot_cpu_data.x86_model == 0x10)
+		if (boot_cpu_data.x86_model >= 0x6 &&
+		    boot_cpu_data.x86_model <= 0x18)
 			event_mask = HYGON_F18H_M6H_RAW_EVENT_MASK_NB;
 	}
 	if (pmu_version >= 2 && is_nb_event(event))
@@ -742,10 +740,8 @@ static int __init amd_uncore_init(void)
 			if (boot_cpu_data.x86_model == 0x4 ||
 			    boot_cpu_data.x86_model == 0x5)
 				*df_attr++ = &format_attr_umask10f18h.attr;
-			else if (boot_cpu_data.x86_model == 0x6 ||
-				 boot_cpu_data.x86_model == 0x7 ||
-				 boot_cpu_data.x86_model == 0x8 ||
-				 boot_cpu_data.x86_model == 0x10)
+			 else if (boot_cpu_data.x86_model >= 0x6 &&
+				boot_cpu_data.x86_model <= 0x18)
 				*df_attr++ = &format_attr_umask12f18h.attr;
 		}