Skip to content

Commit e4c995f

Browse files
committed
Merge tag 'perf_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 perf fixes from Borislav Petkov: - Make sure the PEBS buffer is drained before reconfiguring the hardware - Add Arrow Lake U support * tag 'perf_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/intel/ds: Unconditionally drain PEBS DS when changing PEBS_DATA_CFG perf/x86/intel: Add Arrow Lake U support
2 parents df9e210 + 9f3de72 commit e4c995f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

arch/x86/events/intel/core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7135,6 +7135,7 @@ __init int intel_pmu_init(void)
71357135

71367136
case INTEL_METEORLAKE:
71377137
case INTEL_METEORLAKE_L:
7138+
case INTEL_ARROWLAKE_U:
71387139
intel_pmu_init_hybrid(hybrid_big_small);
71397140

71407141
x86_pmu.pebs_latency_data = cmt_latency_data;

arch/x86/events/intel/ds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@ void intel_pmu_pebs_enable(struct perf_event *event)
14891489
* hence we need to drain when changing said
14901490
* size.
14911491
*/
1492-
intel_pmu_drain_large_pebs(cpuc);
1492+
intel_pmu_drain_pebs_buffer();
14931493
adaptive_pebs_record_size_update();
14941494
wrmsrl(MSR_PEBS_DATA_CFG, pebs_data_cfg);
14951495
cpuc->active_pebs_data_cfg = pebs_data_cfg;

0 commit comments

Comments
 (0)