diff options
| author | Zaid Al-Bassam <zalbassam@google.com> | 2023-03-17 15:50:24 -0400 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-03-27 14:01:18 +0100 |
| commit | b3a070869f39be4fad9ea4d99f2c8fab1fb7eead (patch) | |
| tree | 9a6dbf1d3b5caf4f1c2ff9f77311ec9e6c0bbe3c /drivers/perf/arm_pmuv3.c | |
| parent | 11fba29a8a1f2fca08f301426b15c62d8a0b8040 (diff) | |
| download | lwn-b3a070869f39be4fad9ea4d99f2c8fab1fb7eead.tar.gz lwn-b3a070869f39be4fad9ea4d99f2c8fab1fb7eead.zip | |
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>
Diffstat (limited to 'drivers/perf/arm_pmuv3.c')
| -rw-r--r-- | drivers/perf/arm_pmuv3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c index 2cab600af4fd..fc8ed3cd0330 100644 --- a/drivers/perf/arm_pmuv3.c +++ b/drivers/perf/arm_pmuv3.c @@ -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; } |