Skip to content

Commit 32e5b57

Browse files
l1kbroonie
authored andcommitted
spi: pxa2xx: Fix controller unregister order
The PXA2xx SPI driver uses devm_spi_register_controller() on bind. As a consequence, on unbind, __device_release_driver() first invokes pxa2xx_spi_remove() before unregistering the SPI controller via devres_release_all(). This order is incorrect: pxa2xx_spi_remove() disables the chip, rendering the SPI bus inaccessible even though the SPI controller is still registered. When the SPI controller is subsequently unregistered, it unbinds all its slave devices. Because their drivers cannot access the SPI bus, e.g. to quiesce interrupts, the slave devices may be left in an improper state. As a rule, devm_spi_register_controller() must not be used if the ->remove() hook performs teardown steps which shall be performed after unregistering the controller and specifically after unbinding of slaves. Fix by reverting to the non-devm variant of spi_register_controller(). An alternative approach would be to use device-managed functions for all steps in pxa2xx_spi_remove(), e.g. by calling devm_add_action_or_reset() on probe. However that approach would add more LoC to the driver and it wouldn't lend itself as well to backporting to stable. The improper use of devm_spi_register_controller() was introduced in 2013 by commit a807fcd ("spi: pxa2xx: use devm_spi_register_master()"), but all earlier versions of the driver going back to 2006 were likewise broken because they invoked spi_unregister_master() at the end of pxa2xx_spi_remove(), rather than at the beginning. Fixes: e0c9905 ("[PATCH] SPI: add PXA2xx SSP SPI Driver") Signed-off-by: Lukas Wunner <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Cc: [email protected] # v2.6.17+ Cc: Tsuchiya Yuto <[email protected]> Link: https://bugzilla.kernel.org/show_bug.cgi?id=206403#c1 Link: https://lore.kernel.org/r/834c446b1cf3284d2660f1bee1ebe3e737cd02a9.1590408496.git.lukas@wunner.de Signed-off-by: Mark Brown <[email protected]>
1 parent ca8b19d commit 32e5b57

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/spi/spi-pxa2xx.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
18841884

18851885
/* Register with the SPI framework */
18861886
platform_set_drvdata(pdev, drv_data);
1887-
status = devm_spi_register_controller(&pdev->dev, controller);
1887+
status = spi_register_controller(controller);
18881888
if (status != 0) {
18891889
dev_err(&pdev->dev, "problem registering spi controller\n");
18901890
goto out_error_pm_runtime_enabled;
@@ -1916,6 +1916,8 @@ static int pxa2xx_spi_remove(struct platform_device *pdev)
19161916

19171917
pm_runtime_get_sync(&pdev->dev);
19181918

1919+
spi_unregister_controller(drv_data->controller);
1920+
19191921
/* Disable the SSP at the peripheral and SOC level */
19201922
pxa2xx_spi_write(drv_data, SSCR0, 0);
19211923
clk_disable_unprepare(ssp->clk);

0 commit comments

Comments
 (0)