drm/i915/pmu: Return -EINVAL when selecting the inactive CPU

In commit 0426c0465461 ("drm/i915/pmu: Only allow running on a single
CPU") I attempted to clarify the CPU hotplug logic in our PMU
implementation, but missed that a more logical error to return, when
attempting to initialize an event on a currently inactive CPU, is -EINVAL
rather than -ENODEV.

This is because i915 PMU explicitly disallows running counters on more
than one CPU at a time, and is not reporting that the requested CPU does
not exist, or is off-line.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171128105515.21998-1-tvrtko.ursulin@linux.intel.com

diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c
index 3357b690ce9094c1abeef4f1620173f8ef8dce0d..1c0ee9d68b0460acf73cd8b69864e0d15aac0f0a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@ -338,7 +338,7 @@ static int i915_pmu_event_init(struct perf_event *event)
 
        /* only allow running on one cpu at a time */
        if (!cpumask_test_cpu(event->cpu, &i915_pmu_cpumask))
-               return -ENODEV;
+               return -EINVAL;
 
        if (is_engine_event(event)) {
                ret = engine_event_init(event);