lkml.org 
[lkml]   [2018]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 07/32] spi: atmel: fixed spin_lock usage inside atmel_spi_remove
    Date
    From: Radu Pirea <radu.pirea@microchip.com>

    [ Upstream commit 66e900a3d225575c8b48b59ae1fe74bb6e5a65cc ]

    The only part of atmel_spi_remove which needs to be atomic is hardware
    reset.

    atmel_spi_stop_dma calls dma_terminate_all and this needs interrupts
    enabled.
    atmel_spi_release_dma calls dma_release_channel and dma_release_channel
    locks a mutex inside of spin_lock.

    So the call of these functions can't be inside a spin_lock.

    Reported-by: Jia-Ju Bai <baijiaju1990@gmail.com>
    Signed-off-by: Radu Pirea <radu.pirea@microchip.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/spi/spi-atmel.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
    index 8feac599e9ab..44be6b593b30 100644
    --- a/drivers/spi/spi-atmel.c
    +++ b/drivers/spi/spi-atmel.c
    @@ -1669,12 +1669,12 @@ static int atmel_spi_remove(struct platform_device *pdev)
    pm_runtime_get_sync(&pdev->dev);

    /* reset the hardware and block queue progress */
    - spin_lock_irq(&as->lock);
    if (as->use_dma) {
    atmel_spi_stop_dma(as);
    atmel_spi_release_dma(as);
    }

    + spin_lock_irq(&as->lock);
    spi_writel(as, CR, SPI_BIT(SWRST));
    spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
    spi_readl(as, SR);
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-02-03 19:22    [W:4.027 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site