Skip to contentSkip to conversation

spi: spi-fsl-dspi: Adding shutdown hook

PATCH In review Peng Ma 2 participants 3 messages Apr 24, 2020 – Apr 27, 2020

Subsystems (2)
lore
Share & tools
lore

Peng Ma

author
#0 lore raw

PATCH 1/1 spi: spi-fsl-dspi: Adding shutdown hook

We need to ensure dspi controller could be stopped in order for kexec to start the next kernel.
So add the shutdown operation support.

---
 drivers/spi/spi-fsl-dspi.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
drivers/spi/spi-fsl-dspi.c +23 -0
index 50e41f66a2d7..685afdf9e807 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 //
 // Copyright 2013 Freescale Semiconductor, Inc.
+// Copyright 2020 NXP
 //
 // Freescale DSPI driver
 // This file contains a driver for the Freescale DSPI
@@ -26,6 +27,9 @@
 #define SPI_MCR_CLR_TXF			BIT(11)
 #define SPI_MCR_CLR_RXF			BIT(10)
 #define SPI_MCR_XSPI			BIT(3)
+#define SPI_MCR_DIS_TXF			BIT(13)
+#define SPI_MCR_DIS_RXF			BIT(12)
+#define SPI_MCR_HALT			BIT(0)
 
 #define SPI_TCR				0x08
 #define SPI_TCR_GET_TCNT(x)		(((x) & GENMASK(31, 16)) >> 16)
@@ -1417,6 +1421,24 @@ static int dspi_remove(struct platform_device *pdev)
 	return 0;
 }
 
+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);
+}
+
 static struct platform_driver fsl_dspi_driver = {
 	.driver.name		= DRIVER_NAME,
 	.driver.of_match_table	= fsl_dspi_dt_ids,
@@ -1424,6 +1446,7 @@ static struct platform_driver fsl_dspi_driver = {
 	.driver.pm		= &dspi_pm,
 	.probe			= dspi_probe,
 	.remove			= dspi_remove,
+	.shutdown		= dspi_shutdown,
 };
 module_platform_driver(fsl_dspi_driver);
 
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 10 lines · Peng Ma

We need to ensure dspi controller could be stopped in order for kexec to start the next kernel.
So add the shutdown operation support.

---
 drivers/spi/spi-fsl-dspi.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.8

Thanks!

[1/1] spi: spi-fsl-dspi: Adding shutdown hook

      commit: dc234825997ec6ff05980ca9e2204f4ac3f8d695

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

author
#2 lore raw

Hi Mark,

Quoted 45 lines

-----Original Message-----
From: Mark Brown <[email protected]>
Sent: 2020年4月24日 20:57
To: Leo Li <[email protected]>; Peng Ma <[email protected]>
Cc: [email protected]; [email protected]
Subject: [EXT] Re: [PATCH] spi: spi-fsl-dspi: Adding shutdown hook

Caution: EXT Email

Quoted 10 lines · Peng Ma

We need to ensure dspi controller could be stopped in order for kexec to start the next kernel.
So add the shutdown operation support.

---
 drivers/spi/spi-fsl-dspi.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

[...]

Applied to

https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.kerne
l.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fbroonie%2Fspi.git&amp;data =02%7C01%7Cpeng.ma%40nxp.com%7C1cae36a19be74172501c08d7e84ef418 %7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637233298112661854 &amp;sdata=7WllSlzlH5AtoQ4T8DvvI7GCysPmXivnu4A8aghUxys%3D&amp;reser ved=0 for-5.8

Thanks!

[1/1] spi: spi-fsl-dspi: Adding shutdown hook

     commit: dc234825997ec6ff05980ca9e2204f4ac3f8d695

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.

Quoted 7 lines

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.

[Peng Ma] OK, Got it, thanks very much!

Best Regards,
Peng

Quoted 2 lines

Thanks,
Mark