From 00a797225e53a4f488ab725e0b438c2970aa41d7 Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Tue, 28 Nov 2017 10:55:15 +0000 Subject: [PATCH] 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 Reported-by: Chris Wilson Cc: Chris Wilson Reviewed-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20171128105515.21998-1-tvrtko.ursulin@linux.intel.com --- drivers/gpu/drm/i915/i915_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c index 3357b690ce90..1c0ee9d68b04 100644 --- 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);