lkml.org 
[lkml]   [2022]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 32/78] mtd: rawnand: Fix return value check of wait_for_completion_timeout
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit 084c16ab423a8890121b902b405823bfec5b4365 ]

    wait_for_completion_timeout() returns unsigned long not int.
    It returns 0 if timed out, and positive if completed.
    The check for <= 0 is ambiguous and should be == 0 here
    indicating timeout which is the only error case.

    Fixes: 83738d87e3a0 ("mtd: sh_flctl: Add DMA capabilty")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/linux-mtd/20220412083435.29254-1-linmq006@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mtd/nand/sh_flctl.c | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
    index f2ed03ee3035..eac65aff5401 100644
    --- a/drivers/mtd/nand/sh_flctl.c
    +++ b/drivers/mtd/nand/sh_flctl.c
    @@ -399,7 +399,8 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,
    dma_addr_t dma_addr;
    dma_cookie_t cookie;
    uint32_t reg;
    - int ret;
    + int ret = 0;
    + unsigned long time_left;

    if (dir == DMA_FROM_DEVICE) {
    chan = flctl->chan_fifo0_rx;
    @@ -440,13 +441,14 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,
    goto out;
    }

    - ret =
    + time_left =
    wait_for_completion_timeout(&flctl->dma_complete,
    msecs_to_jiffies(3000));

    - if (ret <= 0) {
    + if (time_left == 0) {
    dmaengine_terminate_all(chan);
    dev_err(&flctl->pdev->dev, "wait_for_completion_timeout\n");
    + ret = -ETIMEDOUT;
    }

    out:
    @@ -456,7 +458,7 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf,

    dma_unmap_single(chan->device->dev, dma_addr, len, dir);

    - /* ret > 0 is success */
    + /* ret == 0 is success */
    return ret;
    }

    @@ -480,7 +482,7 @@ static void read_fiforeg(struct sh_flctl *flctl, int rlen, int offset)

    /* initiate DMA transfer */
    if (flctl->chan_fifo0_rx && rlen >= 32 &&
    - flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_FROM_DEVICE) > 0)
    + !flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_FROM_DEVICE))
    goto convert; /* DMA success */

    /* do polling transfer */
    @@ -539,7 +541,7 @@ static void write_ec_fiforeg(struct sh_flctl *flctl, int rlen,

    /* initiate DMA transfer */
    if (flctl->chan_fifo0_tx && rlen >= 32 &&
    - flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_TO_DEVICE) > 0)
    + !flctl_dma_fifo0_transfer(flctl, buf, rlen, DMA_TO_DEVICE))
    return; /* DMA success */

    /* do polling transfer */
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-10 15:31    [W:4.108 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site