Skip to content

Commit 2f29d78

Browse files
Lareine Khawalygregkh
Lareine Khawaly
authored andcommitted
i2c: designware: use casting of u64 in clock multiplication to avoid overflow
[ Upstream commit c8c37bc ] In functions i2c_dw_scl_lcnt() and i2c_dw_scl_hcnt() may have overflow by depending on the values of the given parameters including the ic_clk. For example in our use case where ic_clk is larger than one million, multiplication of ic_clk * 4700 will result in 32 bit overflow. Add cast of u64 to the calculation to avoid multiplication overflow, and use the corresponding define for divide. Fixes: 2373f6b ("i2c-designware: split of i2c-designware.c into core and bus specific parts") Signed-off-by: Lareine Khawaly <[email protected]> Signed-off-by: Hanna Hawa <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Acked-by: Jarkko Nikula <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent b03f7ed commit 2f29d78

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/i2c/busses/i2c-designware-common.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,8 @@ u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset)
351351
*
352352
* If your hardware is free from tHD;STA issue, try this one.
353353
*/
354-
return DIV_ROUND_CLOSEST(ic_clk * tSYMBOL, MICRO) - 8 + offset;
354+
return DIV_ROUND_CLOSEST_ULL((u64)ic_clk * tSYMBOL, MICRO) -
355+
8 + offset;
355356
else
356357
/*
357358
* Conditional expression:
@@ -367,7 +368,8 @@ u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset)
367368
* The reason why we need to take into account "tf" here,
368369
* is the same as described in i2c_dw_scl_lcnt().
369370
*/
370-
return DIV_ROUND_CLOSEST(ic_clk * (tSYMBOL + tf), MICRO) - 3 + offset;
371+
return DIV_ROUND_CLOSEST_ULL((u64)ic_clk * (tSYMBOL + tf), MICRO) -
372+
3 + offset;
371373
}
372374

373375
u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset)
@@ -383,7 +385,8 @@ u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset)
383385
* account the fall time of SCL signal (tf). Default tf value
384386
* should be 0.3 us, for safety.
385387
*/
386-
return DIV_ROUND_CLOSEST(ic_clk * (tLOW + tf), MICRO) - 1 + offset;
388+
return DIV_ROUND_CLOSEST_ULL((u64)ic_clk * (tLOW + tf), MICRO) -
389+
1 + offset;
387390
}
388391

389392
int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev)

0 commit comments

Comments
 (0)