lkml.org 
[lkml]   [2021]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 36/57] dmaengine: pl330: fix wrong usage of spinlock flags in dma_cyclc
    Date
    From: Bumyong Lee <bumyong.lee@samsung.com>

    commit 4ad5dd2d7876d79507a20f026507d1a93b8fff10 upstream.

    flags varible which is the input parameter of pl330_prep_dma_cyclic()
    should not be used by spinlock_irq[save/restore] function.

    Signed-off-by: Jongho Park <jongho7.park@samsung.com>
    Signed-off-by: Bumyong Lee <bumyong.lee@samsung.com>
    Signed-off-by: Chanho Park <chanho61.park@samsung.com>
    Link: https://lore.kernel.org/r/20210507063647.111209-1-chanho61.park@samsung.com
    Fixes: f6f2421c0a1c ("dmaengine: pl330: Merge dma_pl330_dmac and pl330_dmac structs")
    Cc: stable@vger.kernel.org
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/dma/pl330.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
    index 7f66ae1945b2..6ea993478ddd 100644
    --- a/drivers/dma/pl330.c
    +++ b/drivers/dma/pl330.c
    @@ -2531,13 +2531,15 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
    for (i = 0; i < len / period_len; i++) {
    desc = pl330_get_desc(pch);
    if (!desc) {
    + unsigned long iflags;
    +
    dev_err(pch->dmac->ddma.dev, "%s:%d Unable to fetch desc\n",
    __func__, __LINE__);

    if (!first)
    return NULL;

    - spin_lock_irqsave(&pl330->pool_lock, flags);
    + spin_lock_irqsave(&pl330->pool_lock, iflags);

    while (!list_empty(&first->node)) {
    desc = list_entry(first->node.next,
    @@ -2547,7 +2549,7 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(

    list_move_tail(&first->node, &pl330->desc_pool);

    - spin_unlock_irqrestore(&pl330->pool_lock, flags);
    + spin_unlock_irqrestore(&pl330->pool_lock, iflags);

    return NULL;
    }
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-28 17:39    [W:3.507 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site