]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
perf: arm_pmuv3: Drop unnecessary IS_ENABLED(CONFIG_ARM64) check
authorRob Herring (Arm) <robh@kernel.org>
Wed, 26 Jun 2024 22:32:26 +0000 (16:32 -0600)
committerWill Deacon <will@kernel.org>
Wed, 3 Jul 2024 13:07:14 +0000 (14:07 +0100)
The IS_ENABLED(CONFIG_ARM64) check for threshold support is unnecessary.
The purpose is to not enable thresholds on arm32, but if threshold is
non-zero, the check against threshold_max() just above here will have
errored out because threshold_max() is always 0 on arm32.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Acked-by: Mark rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20240626-arm-pmu-3-9-icntr-v2-2-c9784b4f4065@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
drivers/perf/arm_pmuv3.c

index 02b2ac4cd297b1b07a361df63a515fda2d0a58ac..d6248493b5c6a0222aff7cb787ad9f526a51dfb2 100644 (file)
@@ -1045,7 +1045,7 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event,
                return -EINVAL;
        }
 
-       if (IS_ENABLED(CONFIG_ARM64) && th) {
+       if (th) {
                config_base |= FIELD_PREP(ARMV8_PMU_EVTYPE_TH, th);
                config_base |= FIELD_PREP(ARMV8_PMU_EVTYPE_TC,
                                          armv8pmu_event_threshold_control(attr));