From: John Garry Date: Fri, 1 Oct 2021 10:48:45 +0000 (+0800) Subject: drivers/perf: thunderx2_pmu: Change data in size tx2_uncore_event_update() X-Git-Tag: v6.1-rc5~2674^2~11^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78cac393b4642eb5936d9c0685acd50d8370648f;p=platform%2Fkernel%2Flinux-starfive.git drivers/perf: thunderx2_pmu: Change data in size tx2_uncore_event_update() A LSL of 32 requires > 32b value to hold the result. However in tx2_uncore_event_update(), 1UL << 32 currently only works as unsigned long is 64b on a 64b system. If we want to compile test for a 32b system, we need unsigned long long, whose min size is 64b. Signed-off-by: John Garry Link: https://lore.kernel.org/r/1633085326-156653-2-git-send-email-john.garry@huawei.com Signed-off-by: Will Deacon --- diff --git a/drivers/perf/thunderx2_pmu.c b/drivers/perf/thunderx2_pmu.c index fc1a376..05378c0 100644 --- a/drivers/perf/thunderx2_pmu.c +++ b/drivers/perf/thunderx2_pmu.c @@ -487,7 +487,7 @@ static void tx2_uncore_event_update(struct perf_event *event) new = reg_readl(hwc->event_base); prev = local64_xchg(&hwc->prev_count, new); /* handles rollover of 32 bit counter */ - delta = (u32)(((1UL << 32) - prev) + new); + delta = (u32)(((1ULL << 32) - prev) + new); } /* DMC event data_transfers granularity is 16 Bytes, convert it to 64 */