Skip to content

Commit 56f4526

Browse files
ksloatdesignlinxmichalsimek
authored andcommitted
pwm: xilinx: Fix u32 overflow issue in 32-bit width PWM mode.
This timer HW supports 8, 16 and 32-bit timer widths. This driver currently uses a u32 to store the max possible value of the timer. However, statements perform addition of 2 in xilinx_pwm_apply() when calculating the period_cycles and duty_cycles values. Since priv->max is a u32, this will result in an overflow to 1 which will not only be incorrect but fail on range comparison. This results in making it impossible to set the PWM in this timer mode. There are two obvious solutions to the current problem: 1. Cast each instance where overflow occurs to u64. 2. Change priv->max from a u32 to a u64. Solution #1 requires more code modifications, and leaves opportunity to introduce similar overflows if other math statements are added in the future. These may also go undetected if running in non 32-bit timer modes. Solution #2 is the much smaller and cleaner approach and thus the chosen method in this patch. This was tested on a Zynq UltraScale+ with multiple instances of the PWM IP. Signed-off-by: Ken Sloat <[email protected]> Reviewed-by: Michal Simek <[email protected]> Reviewed-by: Sean Anderson <[email protected]> Link: https://lore.kernel.org/r/SJ0P222MB0107490C5371B848EF04351CA1E19@SJ0P222MB0107.NAMP222.PROD.OUTLOOK.COM Signed-off-by: Michal Simek <[email protected]>
1 parent 1613e60 commit 56f4526

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/clocksource/timer-xilinx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct regmap;
4141
struct xilinx_timer_priv {
4242
struct regmap *map;
4343
struct clk *clk;
44-
u32 max;
44+
u64 max;
4545
};
4646

4747
/**

0 commit comments

Comments
 (0)