lkml.org 
[lkml]   [2021]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 041/306] Revert "dmaengine: imx-sdma: refine to load context only once"
    Date
    From: Robin Gong <yibin.gong@nxp.com>

    commit 8592f02464d52776c5cfae4627c6413b0ae7602d upstream.

    This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because
    in spi-imx case, burst length may be changed dynamically.

    Fixes: ad0d92d7ba6a ("dmaengine: imx-sdma: refine to load context only once")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Robin Gong <yibin.gong@nxp.com>
    Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
    Tested-by: Richard Leitner <richard.leitner@skidata.com>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/dma/imx-sdma.c | 8 --------
    1 file changed, 8 deletions(-)

    --- a/drivers/dma/imx-sdma.c
    +++ b/drivers/dma/imx-sdma.c
    @@ -379,7 +379,6 @@ struct sdma_channel {
    unsigned long watermark_level;
    u32 shp_addr, per_addr;
    enum dma_status status;
    - bool context_loaded;
    struct imx_dma_data data;
    struct work_struct terminate_worker;
    };
    @@ -985,9 +984,6 @@ static int sdma_load_context(struct sdma
    int ret;
    unsigned long flags;

    - if (sdmac->context_loaded)
    - return 0;
    -
    if (sdmac->direction == DMA_DEV_TO_MEM)
    load_address = sdmac->pc_from_device;
    else if (sdmac->direction == DMA_DEV_TO_DEV)
    @@ -1030,8 +1026,6 @@ static int sdma_load_context(struct sdma

    spin_unlock_irqrestore(&sdma->channel_0_lock, flags);

    - sdmac->context_loaded = true;
    -
    return ret;
    }

    @@ -1070,7 +1064,6 @@ static void sdma_channel_terminate_work(
    vchan_get_all_descriptors(&sdmac->vc, &head);
    spin_unlock_irqrestore(&sdmac->vc.lock, flags);
    vchan_dma_desc_free_list(&sdmac->vc, &head);
    - sdmac->context_loaded = false;
    }

    static int sdma_terminate_all(struct dma_chan *chan)
    @@ -1338,7 +1331,6 @@ static void sdma_free_chan_resources(str

    sdmac->event_id0 = 0;
    sdmac->event_id1 = 0;
    - sdmac->context_loaded = false;

    sdma_set_channel_priority(sdmac, 0);


    \
     
     \ /
      Last update: 2021-09-16 18:12    [W:4.626 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site