Skip to content

Commit 4cdf0e7

Browse files
suryasaimadhugregkh
authored andcommitted
perf/imx_ddr: Fix undefined behavior due to shift overflowing the constant
[ Upstream commit d02b4dd ] Fix: In file included from <command-line>:0:0: In function ‘ddr_perf_counter_enable’, inlined from ‘ddr_perf_irq_handler’ at drivers/perf/fsl_imx8_ddr_perf.c:651:2: ././include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_729’ \ declared with attribute error: FIELD_PREP: mask is not constant _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ... See https://lore.kernel.org/r/YkwQ6%[email protected] for the gory details as to why it triggers with older gccs only. Signed-off-by: Borislav Petkov <[email protected]> Cc: Frank Li <[email protected]> Cc: Will Deacon <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Shawn Guo <[email protected]> Cc: Sascha Hauer <[email protected]> Cc: Pengutronix Kernel Team <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: NXP Linux Team <[email protected]> Cc: [email protected] Acked-by: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent b8ed0f7 commit 4cdf0e7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/perf/fsl_imx8_ddr_perf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define CNTL_OVER_MASK 0xFFFFFFFE
3030

3131
#define CNTL_CSV_SHIFT 24
32-
#define CNTL_CSV_MASK (0xFF << CNTL_CSV_SHIFT)
32+
#define CNTL_CSV_MASK (0xFFU << CNTL_CSV_SHIFT)
3333

3434
#define EVENT_CYCLES_ID 0
3535
#define EVENT_CYCLES_COUNTER 0

0 commit comments

Comments
 (0)