Commit 186c91aa authored by James Clark's avatar James Clark Committed by Will Deacon

arm: pmu: Move error message and -EOPNOTSUPP to individual PMUs

-EPERM or -EINVAL always get converted to -EOPNOTSUPP, so replace them.
This will allow __hw_perf_event_init() to return a different code or not
print that particular message for a different error in the next commit.
Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Link: https://lore.kernel.org/r/20231211161331.1277825-10-james.clark@arm.comSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent c7b98bf0
...@@ -1052,8 +1052,10 @@ static int armv7pmu_set_event_filter(struct hw_perf_event *event, ...@@ -1052,8 +1052,10 @@ static int armv7pmu_set_event_filter(struct hw_perf_event *event,
{ {
unsigned long config_base = 0; unsigned long config_base = 0;
if (attr->exclude_idle) if (attr->exclude_idle) {
return -EPERM; pr_debug("ARM performance counters do not support mode exclusion\n");
return -EOPNOTSUPP;
}
if (attr->exclude_user) if (attr->exclude_user)
config_base |= ARMV7_EXCLUDE_USER; config_base |= ARMV7_EXCLUDE_USER;
if (attr->exclude_kernel) if (attr->exclude_kernel)
......
...@@ -524,8 +524,10 @@ static int m1_pmu_set_event_filter(struct hw_perf_event *event, ...@@ -524,8 +524,10 @@ static int m1_pmu_set_event_filter(struct hw_perf_event *event,
{ {
unsigned long config_base = 0; unsigned long config_base = 0;
if (!attr->exclude_guest) if (!attr->exclude_guest) {
return -EINVAL; pr_debug("ARM performance counters do not support mode exclusion\n");
return -EOPNOTSUPP;
}
if (!attr->exclude_kernel) if (!attr->exclude_kernel)
config_base |= M1_PMU_CFG_COUNT_KERNEL; config_base |= M1_PMU_CFG_COUNT_KERNEL;
if (!attr->exclude_user) if (!attr->exclude_user)
......
...@@ -445,7 +445,7 @@ __hw_perf_event_init(struct perf_event *event) ...@@ -445,7 +445,7 @@ __hw_perf_event_init(struct perf_event *event)
{ {
struct arm_pmu *armpmu = to_arm_pmu(event->pmu); struct arm_pmu *armpmu = to_arm_pmu(event->pmu);
struct hw_perf_event *hwc = &event->hw; struct hw_perf_event *hwc = &event->hw;
int mapping; int mapping, ret;
hwc->flags = 0; hwc->flags = 0;
mapping = armpmu->map_event(event); mapping = armpmu->map_event(event);
...@@ -470,11 +470,10 @@ __hw_perf_event_init(struct perf_event *event) ...@@ -470,11 +470,10 @@ __hw_perf_event_init(struct perf_event *event)
/* /*
* Check whether we need to exclude the counter from certain modes. * Check whether we need to exclude the counter from certain modes.
*/ */
if (armpmu->set_event_filter && if (armpmu->set_event_filter) {
armpmu->set_event_filter(hwc, &event->attr)) { ret = armpmu->set_event_filter(hwc, &event->attr);
pr_debug("ARM performance counters do not support " if (ret)
"mode exclusion\n"); return ret;
return -EOPNOTSUPP;
} }
/* /*
......
...@@ -936,8 +936,10 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event, ...@@ -936,8 +936,10 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event,
{ {
unsigned long config_base = 0; unsigned long config_base = 0;
if (attr->exclude_idle) if (attr->exclude_idle) {
return -EPERM; pr_debug("ARM performance counters do not support mode exclusion\n");
return -EOPNOTSUPP;
}
/* /*
* If we're running in hyp mode, then we *are* the hypervisor. * If we're running in hyp mode, then we *are* the hypervisor.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment