lkml.org 
[lkml]   [2020]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 062/186] dmaengine: pl330: Fix burst length if burst size is smaller than bus width
    Date
    From: Marek Szyprowski <m.szyprowski@samsung.com>

    [ Upstream commit 0661cef675d37e2c4b66a996389ebeae8568e49e ]

    Move the burst len fixup after setting the generic value for it. This
    finally enables the fixup introduced by commit 137bd11090d8 ("dmaengine:
    pl330: Align DMA memcpy operations to MFIFO width"), which otherwise was
    overwritten by the generic value.

    Reported-by: kernel test robot <lkp@intel.com>
    Fixes: 137bd11090d8 ("dmaengine: pl330: Align DMA memcpy operations to MFIFO width")
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Link: https://lore.kernel.org/r/20200825064617.16193-1-m.szyprowski@samsung.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/pl330.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
    index 88b884cbb7c1b..9d8a235a5b884 100644
    --- a/drivers/dma/pl330.c
    +++ b/drivers/dma/pl330.c
    @@ -2788,6 +2788,7 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
    while (burst != (1 << desc->rqcfg.brst_size))
    desc->rqcfg.brst_size++;

    + desc->rqcfg.brst_len = get_burst_len(desc, len);
    /*
    * If burst size is smaller than bus width then make sure we only
    * transfer one at a time to avoid a burst stradling an MFIFO entry.
    @@ -2795,7 +2796,6 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
    if (desc->rqcfg.brst_size * 8 < pl330->pcfg.data_bus_width)
    desc->rqcfg.brst_len = 1;

    - desc->rqcfg.brst_len = get_burst_len(desc, len);
    desc->bytes_requested = len;

    desc->txd.flags = flags;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-08 21:36    [W:2.560 / U:1.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site