diff options
| author | Borislav Petkov <bp@suse.de> | 2022-03-21 12:34:57 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-03-21 12:34:57 +0300 |
| commit | 1422df58e5eb83dca131dc64e0f307a1f9e56078 (patch) | |
| tree | f54bb7952a406cd783cbdbfe1b5ac4f80de02d68 /arch/x86/events/perf_event.h | |
| parent | e1bca853dddcb57cbf084acbf35e3654cef6fc75 (diff) | |
| parent | 2151c84ece920dc55942495004a823cbecb921e5 (diff) | |
| download | linux-1422df58e5eb83dca131dc64e0f307a1f9e56078.tar.xz | |
Merge branch 'edac-amd64' into edac-updates-for-v5.18
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/events/perf_event.h')
| -rw-r--r-- | arch/x86/events/perf_event.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index 9d376e528dfc..150261d929b9 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -215,7 +215,8 @@ enum { LBR_FORMAT_EIP_FLAGS2 = 0x04, LBR_FORMAT_INFO = 0x05, LBR_FORMAT_TIME = 0x06, - LBR_FORMAT_MAX_KNOWN = LBR_FORMAT_TIME, + LBR_FORMAT_INFO2 = 0x07, + LBR_FORMAT_MAX_KNOWN = LBR_FORMAT_INFO2, }; enum { @@ -840,6 +841,11 @@ struct x86_pmu { bool lbr_double_abort; /* duplicated lbr aborts */ bool lbr_pt_coexist; /* (LBR|BTS) may coexist with PT */ + unsigned int lbr_has_info:1; + unsigned int lbr_has_tsx:1; + unsigned int lbr_from_flags:1; + unsigned int lbr_to_cycles:1; + /* * Intel Architectural LBR CPUID Enumeration */ @@ -1392,6 +1398,8 @@ void intel_pmu_lbr_init_skl(void); void intel_pmu_lbr_init_knl(void); +void intel_pmu_lbr_init(void); + void intel_pmu_arch_lbr_init(void); void intel_pmu_pebs_data_source_nhm(void); |