lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 130/228] fsl/fman: use 32-bit unsigned integer
    Date
    From: Florinel Iordache <florinel.iordache@nxp.com>

    [ 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>
    ---
    drivers/net/ethernet/freescale/fman/fman.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
    index 9080d2332d030..cdd48b1cc84a7 100644
    --- 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
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 13:07    [W:4.074 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site