Unverified Commit 0fd797fd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14259 【OLK-6.6】 Hygon family 18h model 6h~fh L3 PMU config incorrect issue fix 

Merge Pull Request from: @hygon_fanwh 
 
Fix L3 PMU config incorrect issue for Hygon f18h model 6h~fh processors.

Reference:
https://gitee.com/openeuler/kernel/pulls/3835
https://gitee.com/openeuler/kernel/pulls/7219
https://gitee.com/openeuler/kernel/pulls/8819
https://gitee.com/openeuler/kernel/pulls/4356 
 
Link:https://gitee.com/openeuler/kernel/pulls/14259
parents 73fa27d5 95bf2e60

arch/x86/events/amd/uncore.c

+2 −2
Original line number Diff line number Diff line
@@ -790,10 +790,10 @@ static int amd_uncore_l3_event_init(struct perf_event *event) 
	else if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON &&

		 boot_cpu_data.x86 == 0x18) {

		if (boot_cpu_data.x86_model >= 0x6 && boot_cpu_data.x86_model <= 0xf)

			return ((config & HYGON_L3_SLICE_MASK) ? : HYGON_L3_SLICE_MASK) |

			mask = ((config & HYGON_L3_SLICE_MASK) ? : HYGON_L3_SLICE_MASK) |

			       ((config & HYGON_L3_THREAD_MASK) ? : HYGON_L3_THREAD_MASK);

		else

			return ((config & AMD64_L3_SLICE_MASK) ? : AMD64_L3_SLICE_MASK) |

			mask = ((config & AMD64_L3_SLICE_MASK) ? : AMD64_L3_SLICE_MASK) |

			       ((config & AMD64_L3_THREAD_MASK) ? : AMD64_L3_THREAD_MASK);

	}