Merge branch 'perf/m1-guest-events' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --cc drivers/perf/apple_m1_cpu_pmu.c
index 39349ecec3c1dfec0d26a3731c09d2f71fffcd2b,d6d4ff6da8626274097e11e271dfe63d7305224f..9a0d1420ac4ffcc570ad4446ae3f69ce560c60da
--- 1/drivers/perf/apple_m1_cpu_pmu.c
--- 2/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();