Unverified Commit 7684580d authored Jun 22, 2020 by Krzysztof Kozlowski Committed by Mark Brown Jun 22, 2020

spi: spi-fsl-dspi: Fix lockup if device is removed during SPI transfer



During device removal, the driver should unregister the SPI controller
and stop the hardware.  Otherwise the dspi_transfer_one_message() could
wait on completion infinitely.

Additionally, calling spi_unregister_controller() first in device
removal reverse-matches the probe function, where SPI controller is
registered at the end.

Fixes: 05209f45 ("spi: fsl-dspi: add missing clk_disable_unprepare() in dspi_remove()")
Reported-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200622110543.5035-1-krzk@kernel.org


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 06096cc6

drivers/spi/spi-fsl-dspi.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -1434,9 +1434,18 @@ static int dspi_remove(struct platform_device *pdev)
		struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr);

		/* Disconnect from the SPI framework */
		spi_unregister_controller(dspi->ctlr);

		/* Disable RX and TX */
		regmap_update_bits(dspi->regmap, SPI_MCR,
		SPI_MCR_DIS_TXF \| SPI_MCR_DIS_RXF,
		SPI_MCR_DIS_TXF \| SPI_MCR_DIS_RXF);

		/* Stop Running */
		regmap_update_bits(dspi->regmap, SPI_MCR, SPI_MCR_HALT, SPI_MCR_HALT);

		dspi_release_dma(dspi);
		clk_disable_unprepare(dspi->clk);
		spi_unregister_controller(dspi->ctlr);

		return 0;
		}

Admin message