perf/x86/uncore: Add DF PMU support for Hygon family 18h model 18h

commit dbab1265fda0034466e3d7b1d7c4e1877fbf84d2 anolis.

ANBZ: #30150

Adjust the DF PMU event and umask for Hygon family 18h model 18h processor.

Hygon-SIG: commit none hygon anolis: perf/x86/uncore: Add DF PMU support for Hygon family 18h model 18h

Hygon-SIG: commit dbab1265fda0 anolis anolis: perf/x86/uncore: Add DF PMU support for Hygon family 18h model 18h
Backport from anolis to support Hygon family 18h model 18h

Signed-off-by: Liao Xuan <liaoxuan@hygon.cn>
Cc: hygon-arch@list.openanolis.cn
Reviewed-by Guixin Liu <kanie@linux.alibaba.com>
Link: https://gitee.com/anolis/cloud-kernel/pulls/6464
[ YuntongJin: amend commit log, fix conflict ]
Signed-off-by: YuntongJin <jinyuntong@hygon.cn>

Author: liaoxuan123

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;
 		}