fsl/fman: use 32-bit unsigned integer

[ Upstream commit 99f47abd9f7bf6e365820d355dc98f6955a562df ]

Potentially overflowing expression (ts_freq << 16 and intgr << 16)
declared as type u32 (32-bit unsigned) is evaluated using 32-bit
arithmetic and then used in a context that expects an expression of
type u64 (64-bit unsigned) which ultimately is used as 16-bit
unsigned by typecasting to u16. Fixed by using an unsigned 32-bit
integer since the value is truncated anyway in the end.

Fixes: 414fd46e7762 ("fsl/fman: Add FMan support")
Signed-off-by: Florinel Iordache <florinel.iordache@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index 4c2fa13a7dd7bb55b7bbb886bc81483fe0ece75a..c8e434c8ab983910b8f78fb2845c7cfd709b1e87 100644 (file)
--- a/drivers/net/ethernet/freescale/fman/fman.c
+++ b/drivers/net/ethernet/freescale/fman/fman.c
@@ -1396,8 +1396,7 @@ static void enable_time_stamp(struct fman *fman)
 {
        struct fman_fpm_regs __iomem *fpm_rg = fman->fpm_regs;
        u16 fm_clk_freq = fman->state->fm_clk_freq;
-       u32 tmp, intgr, ts_freq;
-       u64 frac;
+       u32 tmp, intgr, ts_freq, frac;
 
        ts_freq = (u32)(1 << fman->state->count1_micro_bit);
        /* configure timestamp so that bit 8 will count 1 microsecond