mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-07 15:15:29 +00:00
spi: atmel: fixed spin_lock usage inside atmel_spi_remove
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>
This commit is contained in:
parent
4fbd8d194f
commit
66e900a3d2
1 changed files with 1 additions and 1 deletions
|
@ -1661,12 +1661,12 @@ static int atmel_spi_remove(struct platform_device *pdev)
|
||||||
pm_runtime_get_sync(&pdev->dev);
|
pm_runtime_get_sync(&pdev->dev);
|
||||||
|
|
||||||
/* reset the hardware and block queue progress */
|
/* reset the hardware and block queue progress */
|
||||||
spin_lock_irq(&as->lock);
|
|
||||||
if (as->use_dma) {
|
if (as->use_dma) {
|
||||||
atmel_spi_stop_dma(master);
|
atmel_spi_stop_dma(master);
|
||||||
atmel_spi_release_dma(master);
|
atmel_spi_release_dma(master);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spin_lock_irq(&as->lock);
|
||||||
spi_writel(as, CR, SPI_BIT(SWRST));
|
spi_writel(as, CR, SPI_BIT(SWRST));
|
||||||
spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
|
spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
|
||||||
spi_readl(as, SR);
|
spi_readl(as, SR);
|
||||||
|
|
Loading…
Add table
Reference in a new issue