diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index 6ac6e16043e126f9e57dc951108f1eac9951fd8b..0b4da54fd6e98ff1ed387629d39130ce23680308 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -754,9 +754,12 @@ int amd_uncore_df_ctx_init(struct amd_uncore *uncore, unsigned int cpu)
 	} else if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON &&
 		   boot_cpu_data.x86 == 0x18) {
 		*df_attr++ = &format_attr_event14f18h.attr;
-		if (boot_cpu_data.x86_model == 0x4)
+		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)
+		else if (boot_cpu_data.x86_model == 0x6 ||
+			 boot_cpu_data.x86_model == 0x7 ||
+			 boot_cpu_data.x86_model == 0x10)
 			*df_attr++ = &format_attr_umask12f18h.attr;
 	}