Commit b3a07086 authored Mar 17, 2023 by Zaid Al-Bassam Committed by Will Deacon Mar 27, 2023

perf: pmuv3: Change GENMASK to GENMASK_ULL



GENMASK macro uses "unsigned long" (32-bit wide on arm and 64-bit
on arm64), This causes build issues when enabling PMUv3 on arm as
it tries to access bits > 31. This patch switches the GENMASK to
GENMASK_ULL, which uses "unsigned long long" (64-bit on both arm
and arm64).

Signed-off-by: Zaid Al-Bassam <zalbassam@google.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230317195027.3746949-6-zalbassam@google.com


Signed-off-by: Will Deacon <will@kernel.org>

parent 11fba29a

drivers/perf/arm_pmuv3.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -489,7 +489,7 @@ static bool armv8pmu_event_needs_bias(struct perf_event *event)
		static u64 armv8pmu_bias_long_counter(struct perf_event *event, u64 value)
		{
		if (armv8pmu_event_needs_bias(event))
		value \|= GENMASK(63, 32);
		value \|= GENMASK_ULL(63, 32);

		return value;
		}
		@@ -497,7 +497,7 @@ static u64 armv8pmu_bias_long_counter(struct perf_event *event, u64 value)
		static u64 armv8pmu_unbias_long_counter(struct perf_event *event, u64 value)
		{
		if (armv8pmu_event_needs_bias(event))
		value &= ~GENMASK(63, 32);
		value &= ~GENMASK_ULL(63, 32);

		return value;
		}