From: Will Deacon <will@kernel.org>
Date: Thu, 13 Mar 2025 21:15:28 +0000 (+0000)
Subject: Merge branch 'perf/m1-guest-events' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: io_uring-6.15-20250403~123^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=823437ed2935795837da033e41734f03efad1662;p=linux-block.git

Merge branch 'perf/m1-guest-events' of git://git./linux/kernel/git/oupton/linux into for-next/perf

Pull Apple-M1 PMU driver changes from Oliver Upton, which form a prefix
of the series in the KVM/Arm tree that allows the PMU to be virtualised.
Sort of, anyway.

* 'perf/m1-guest-events' of git://git.kernel.org/pub/scm/linux/kernel/git/oupton/linux:
  drivers/perf: apple_m1: Support host/guest event filtering
  drivers/perf: apple_m1: Refactor event select/filter configuration
---

823437ed2935795837da033e41734f03efad1662
diff --cc drivers/perf/apple_m1_cpu_pmu.c
index 39349ecec3c1,d6d4ff6da862..9a0d1420ac4f
--- a/drivers/perf/apple_m1_cpu_pmu.c
+++ b/drivers/perf/apple_m1_cpu_pmu.c
@@@ -396,7 -416,11 +416,7 @@@ static void m1_pmu_enable_event(struct 
  	user = event->hw.config_base & M1_PMU_CFG_COUNT_USER;
  	kernel = event->hw.config_base & M1_PMU_CFG_COUNT_KERNEL;
  
- 	m1_pmu_configure_counter(event->hw.idx, evt, user, kernel);
 -	m1_pmu_disable_counter_interrupt(event->hw.idx);
 -	m1_pmu_disable_counter(event->hw.idx);
 -	isb();
 -
+ 	m1_pmu_configure_counter(event->hw.idx, event->hw.config_base);
  	m1_pmu_enable_counter(event->hw.idx);
  	m1_pmu_enable_counter_interrupt(event->hw.idx);
  	isb();