On Mon, 22 Jun 2020 at 14:08, Krzysztof Kozlowski krzk@kernel.org wrote:
During shutdown, 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 shutdown reverse-matches the probe function, where SPI controller is registered at the end.
Fixes: dc234825997e ("spi: spi-fsl-dspi: Adding shutdown hook") Cc: stable@vger.kernel.org Reported-by: Vladimir Oltean olteanv@gmail.com Signed-off-by: Krzysztof Kozlowski krzk@kernel.org
Reviewed-by: Vladimir Oltean vladimir.oltean@nxp.com Tested-by: Vladimir Oltean vladimir.oltean@nxp.com
kexec() not tested, only system shutdown.
Changes since v3:
- New patch.
drivers/spi/spi-fsl-dspi.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index ec0fd0d366eb..ec7919d9c0d9 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -1452,20 +1452,7 @@ static int dspi_remove(struct platform_device *pdev)
static void dspi_shutdown(struct platform_device *pdev) {
struct spi_controller *ctlr = platform_get_drvdata(pdev);struct fsl_dspi *dspi = spi_controller_get_devdata(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);
dspi_remove(pdev);}
static struct platform_driver fsl_dspi_driver = {
2.17.1