| Message ID | 20200622110543.5035-1-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7684580d45bd3d84ed9b453a4cadf7a9a5605a3f |
| Headers | show |
| Series | [v4,1/4] spi: spi-fsl-dspi: Fix lockup if device is removed during SPI transfer | expand |
On Mon, 22 Jun 2020 at 14:06, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > 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: 05209f457069 ("spi: fsl-dspi: add missing clk_disable_unprepare() in dspi_remove()") > 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> > > Changes since v3: > 1. New patch. > --- > drivers/spi/spi-fsl-dspi.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c > index 58190c94561f..ec0fd0d366eb 100644 > --- a/drivers/spi/spi-fsl-dspi.c > +++ b/drivers/spi/spi-fsl-dspi.c > @@ -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; > } > -- > 2.17.1 >
On Mon, 22 Jun 2020 13:05:40 +0200, Krzysztof Kozlowski wrote: > 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. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/4] spi: spi-fsl-dspi: Fix lockup if device is removed during SPI transfer commit: 7684580d45bd3d84ed9b453a4cadf7a9a5605a3f [2/4] spi: spi-fsl-dspi: Fix lockup if device is shutdown during SPI transfer commit: 3c525b69e8c1a9a6944e976603c7a1a713e728f9 [3/4] spi: spi-fsl-dspi: Fix external abort on interrupt in resume or exit paths commit: 3d87b613d6a3c6f0980e877ab0895785a2dde581 [4/4] spi: spi-fsl-dspi: Initialize completion before possible interrupt commit: f148915f91fccd8c3df1b0bff7d1c8458cad3be5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 58190c94561f..ec0fd0d366eb 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -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; }
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: 05209f457069 ("spi: fsl-dspi: add missing clk_disable_unprepare() in dspi_remove()") Cc: <stable@vger.kernel.org> Reported-by: Vladimir Oltean <olteanv@gmail.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- Changes since v3: 1. New patch. --- drivers/spi/spi-fsl-dspi.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)