diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index cb0aa2e93d06d67935139f3e8c3d590eb34a023d..c7831fdef5cc5436279b4986cc1939b2b1980477 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -742,10 +742,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;
 		}