Unverified Commit 71033ce6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7219 Hygon model 6h L3 PMU event duplicate creating issue fix 

Merge Pull Request from: @hygoner 
 
Fix L3 PMU event duplicate creating issue for Hygon family 18h model 6h processor.

Reference:
https://gitee.com/openeuler/kernel/pulls/3835 
 
Link:https://gitee.com/openeuler/kernel/pulls/7219

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents c3df1656 4ecea694

arch/x86/events/amd/uncore.c

+2 −1
Original line number Diff line number Diff line
@@ -846,7 +846,8 @@ int amd_uncore_l3_ctx_init(struct amd_uncore *uncore, unsigned int cpu) 
	pmu->rdpmc_base = RDPMC_BASE_LLC;

	pmu->group = amd_uncore_ctx_gid(uncore, cpu);



	if (boot_cpu_data.x86 >= 0x17) {

	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&

	    boot_cpu_data.x86 >= 0x17) {

		*l3_attr++ = &format_attr_event8.attr;

		*l3_attr++ = &format_attr_umask8.attr;

		*l3_attr++ = boot_cpu_data.x86 >= 0x19 ?