[PATCH v3 06/12] arm: perf/core: use PERF_PMU_CAP_NO_EXCLUDE for exclude incapable PMUs

[Andrew Murray]

For drivers that do not support context exclusion let's advertise the
PERF_PMU_CAP_NO_EXCLUDE capability. This ensures that perf will
prevent us from handling events where any exclusion flags are set.
Let's also remove the now unnecessary check for exclusion flags.

Signed-off-by: Andrew Murray <andrew.mur...@arm.com>
---
 arch/arm/mach-imx/mmdc.c     | 9 ++-------
 arch/arm/mm/cache-l2x0-pmu.c | 9 +--------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index 04b3bf7..3453838 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -293,13 +293,7 @@ static int mmdc_pmu_event_init(struct perf_event *event)
                return -EOPNOTSUPP;
        }
 
-       if (event->attr.exclude_user            ||
-                       event->attr.exclude_kernel      ||
-                       event->attr.exclude_hv          ||
-                       event->attr.exclude_idle        ||
-                       event->attr.exclude_host        ||
-                       event->attr.exclude_guest       ||
-                       event->attr.sample_period)
+       if (event->attr.sample_period)
                return -EINVAL;
 
        if (cfg < 0 || cfg >= MMDC_NUM_COUNTERS)
@@ -455,6 +449,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc,
                        .start          = mmdc_pmu_event_start,
                        .stop           = mmdc_pmu_event_stop,
                        .read           = mmdc_pmu_event_update,
+                       .capabilities   = PERF_PMU_CAP_NO_EXCLUDE,
                },
                .mmdc_base = mmdc_base,
                .dev = dev,
diff --git a/arch/arm/mm/cache-l2x0-pmu.c b/arch/arm/mm/cache-l2x0-pmu.c
index afe5b4c..99bcd07 100644
--- a/arch/arm/mm/cache-l2x0-pmu.c
+++ b/arch/arm/mm/cache-l2x0-pmu.c
@@ -314,14 +314,6 @@ static int l2x0_pmu_event_init(struct perf_event *event)
            event->attach_state & PERF_ATTACH_TASK)
                return -EINVAL;
 
-       if (event->attr.exclude_user   ||
-           event->attr.exclude_kernel ||
-           event->attr.exclude_hv     ||
-           event->attr.exclude_idle   ||
-           event->attr.exclude_host   ||
-           event->attr.exclude_guest)
-               return -EINVAL;
-
        if (event->cpu < 0)
                return -EINVAL;
 
@@ -544,6 +536,7 @@ static __init int l2x0_pmu_init(void)
                .del = l2x0_pmu_event_del,
                .event_init = l2x0_pmu_event_init,
                .attr_groups = l2x0_pmu_attr_groups,
+               .capabilities = PERF_PMU_CAP_NO_EXCLUDE,
        };
 
        l2x0_pmu_reset();
-- 
2.7.4