Patch "dmaengine: sf-pdma: apply proper spinlock flags in sf_pdma_prep_dma_memcpy()" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    dmaengine: sf-pdma: apply proper spinlock flags in sf_pdma_prep_dma_memcpy()

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     dmaengine-sf-pdma-apply-proper-spinlock-flags-in-sf_.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit b15e1e7218a5e933ce2efd3af83b67086a729f75
Author: Austin Kim <austin.kim@xxxxxxx>
Date:   Fri Jun 11 07:53:36 2021 +0100

    dmaengine: sf-pdma: apply proper spinlock flags in sf_pdma_prep_dma_memcpy()
    
    [ Upstream commit 94b4cd7c5fc0dd6858a046b00ca729fb0512b9ba ]
    
    The second parameter of spinlock_irq[save/restore] function is flags,
    which is the last input parameter of sf_pdma_prep_dma_memcpy().
    
    So declare local variable 'iflags' to be used as the second parameter of
    spinlock_irq[save/restore] function.
    
    Signed-off-by: Austin Kim <austin.kim@xxxxxxx>
    Link: https://lore.kernel.org/r/20210611065336.GA1121@raspberrypi
    Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/dma/sf-pdma/sf-pdma.c b/drivers/dma/sf-pdma/sf-pdma.c
index 528deb5d9f31..1cd2d7df9715 100644
--- a/drivers/dma/sf-pdma/sf-pdma.c
+++ b/drivers/dma/sf-pdma/sf-pdma.c
@@ -94,6 +94,7 @@ sf_pdma_prep_dma_memcpy(struct dma_chan *dchan,	dma_addr_t dest, dma_addr_t src,
 {
 	struct sf_pdma_chan *chan = to_sf_pdma_chan(dchan);
 	struct sf_pdma_desc *desc;
+	unsigned long iflags;
 
 	if (chan && (!len || !dest || !src)) {
 		dev_err(chan->pdma->dma_dev.dev,
@@ -109,10 +110,10 @@ sf_pdma_prep_dma_memcpy(struct dma_chan *dchan,	dma_addr_t dest, dma_addr_t src,
 	desc->dirn = DMA_MEM_TO_MEM;
 	desc->async_tx = vchan_tx_prep(&chan->vchan, &desc->vdesc, flags);
 
-	spin_lock_irqsave(&chan->vchan.lock, flags);
+	spin_lock_irqsave(&chan->vchan.lock, iflags);
 	chan->desc = desc;
 	sf_pdma_fill_desc(desc, dest, src, len);
-	spin_unlock_irqrestore(&chan->vchan.lock, flags);
+	spin_unlock_irqrestore(&chan->vchan.lock, iflags);
 
 	return desc->async_tx;
 }