FAILED: patch "[PATCH] spi: ti-qspi: fix controller deregistration" failed to apply to 6.6-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 0c18a1bacbb1d8b8aa34d3d004a2cb8226c8b1ea
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026051215-earache-outdated-a817@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0c18a1bacbb1d8b8aa34d3d004a2cb8226c8b1ea Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 10 Apr 2026 10:17:53 +0200
Subject: [PATCH] spi: ti-qspi: fix controller deregistration
Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind.
Note that the controller is suspended before disabling and releasing resources since commit 3ac066e2227c ("spi: spi-ti-qspi: Suspend the queue before removing the device") which avoids issues like unclocked accesses but prevents SPI device drivers from doing I/O during deregistration.
drivers/spi/spi-ti-qspi.c +6 -8
@@ -888,7 +888,7 @@ static int ti_qspi_probe(struct platform_device *pdev) qspi->mmap_enabled = false; qspi->current_cs =-1 ; - ret =devm_spi_register_controller (&pdev->dev, host); + ret =spi_register_controller (host);if (!ret)return 0 ;
@@ -903,19 +903,17 @@ static int ti_qspi_probe(struct platform_device *pdev)static void ti_qspi_remove (struct platform_device *pdev) {struct ti_qspi *qspi =platform_get_drvdata (pdev); -int rc; - rc =spi_controller_suspend (qspi->host); -if (rc) { -dev_alert (&pdev->dev,"spi_controller_suspend() failed (%pe)\n" , -ERR_PTR (rc)); -return ; - } +spi_controller_get (qspi->host); + +spi_unregister_controller (qspi->host);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);ti_qspi_dma_cleanup (qspi); + +spi_controller_put (qspi->host); }static const struct dev_pm_ops ti_qspi_pm_ops = {
Sasha Levin
maintainerPATCH 1/3 spi: spi-ti-qspi: Convert to platform remove callback returning void
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 2f2802d1a59d79a3d00cb429841db502c2bbc3df ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Add an error message to the error path that returned an error before to replace the core's error message with more information. Apart from the different wording of the error message, this patch doesn't introduce a semantic difference.
Stable-dep-of: 0c18a1bacbb1 ("spi: ti-qspi: fix controller deregistration")
--- drivers/spi/spi-ti-qspi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/spi/spi-ti-qspi.c +7 -6
@@ -907,21 +907,22 @@ static int ti_qspi_probe(struct platform_device *pdev)return ret; } -static int ti_qspi_remove (struct platform_device *pdev) +static void ti_qspi_remove (struct platform_device *pdev) {struct ti_qspi *qspi =platform_get_drvdata (pdev);int rc; rc =spi_master_suspend (qspi->master); -if (rc) -return rc; +if (rc) { +dev_alert (&pdev->dev,"spi_master_suspend() failed (%pe)\n" , +ERR_PTR (rc)); +return ; + }pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);ti_qspi_dma_cleanup (qspi); - -return 0 ; }static const struct dev_pm_ops ti_qspi_pm_ops = {
@@ -930,7 +931,7 @@ static const struct dev_pm_ops ti_qspi_pm_ops = {static struct platform_driver ti_qspi_driver = { .probe = ti_qspi_probe, - .remove = ti_qspi_remove, + .remove_new = ti_qspi_remove, .driver = { .name ="ti-qspi" , .pm = &ti_qspi_pm_ops,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 spi: spi-ti-qspi: switch to use modern name
From: Yang Yingliang <[email protected]>
[ Upstream commit 9d93c8d97b4cdb5edddb4c5530881c90eecb7e44 ]
Change legacy name master to modern name host or controller.
No functional changed.
Stable-dep-of: 0c18a1bacbb1 ("spi: ti-qspi: fix controller deregistration")
--- drivers/spi/spi-ti-qspi.c | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-)
drivers/spi/spi-ti-qspi.c +44 -44
@@ -40,7 +40,7 @@ struct ti_qspi {/* list synchronization */ struct mutex list_lock; -struct spi_master *master; +struct spi_controller *host;void __iomem *base;void __iomem *mmap_base;size_t mmap_size;
@@ -137,20 +137,20 @@ static inline void ti_qspi_write(struct ti_qspi *qspi,static int ti_qspi_setup (struct spi_device *spi) { -struct ti_qspi *qspi =spi_master_get_devdata (spi->master); +struct ti_qspi *qspi =spi_controller_get_devdata (spi->controller);int ret; -if (spi->master->busy) { -dev_dbg (qspi->dev,"master busy doing other transfers\n" ); +if (spi->controller->busy) { +dev_dbg (qspi->dev,"host busy doing other transfers\n" );return -EBUSY ; } -if (!qspi->master->max_speed_hz) { +if (!qspi->host->max_speed_hz) {dev_err (qspi->dev,"spi max frequency not defined\n" );return -EINVAL ; } - spi->max_speed_hz =min (spi->max_speed_hz, qspi->master->max_speed_hz); + spi->max_speed_hz =min (spi->max_speed_hz, qspi->host->max_speed_hz); ret =pm_runtime_resume_and_get (qspi->dev);if (ret <0 ) {
@@ -526,7 +526,7 @@ static int ti_qspi_dma_xfer_sg(struct ti_qspi *qspi, struct sg_table rx_sg,static void ti_qspi_enable_memory_map (struct spi_device *spi) { -struct ti_qspi *qspi =spi_master_get_devdata (spi->master); +struct ti_qspi *qspi =spi_controller_get_devdata (spi->controller);ti_qspi_write (qspi,MM_SWITCH ,QSPI_SPI_SWITCH_REG );if (qspi->ctrl_base) {
@@ -540,7 +540,7 @@ static void ti_qspi_enable_memory_map(struct spi_device *spi)static void ti_qspi_disable_memory_map (struct spi_device *spi) { -struct ti_qspi *qspi =spi_master_get_devdata (spi->master); +struct ti_qspi *qspi =spi_controller_get_devdata (spi->controller);ti_qspi_write (qspi,0 ,QSPI_SPI_SWITCH_REG );if (qspi->ctrl_base)
@@ -554,7 +554,7 @@ static void ti_qspi_setup_mmap_read(struct spi_device *spi, u8 opcode, u8 data_nbits, u8 addr_width, u8 dummy_bytes) { - struct ti_qspi *qspi = spi_master_get_devdata(spi->master); + struct ti_qspi *qspi = spi_controller_get_devdata(spi->controller);u32 memval = opcode;switch (data_nbits) {
@@ -576,7 +576,7 @@ static void ti_qspi_setup_mmap_read(struct spi_device *spi, u8 opcode,static int ti_qspi_adjust_op_size (struct spi_mem *mem,struct spi_mem_op *op) { -struct ti_qspi *qspi =spi_controller_get_devdata (mem->spi->master); +struct ti_qspi *qspi =spi_controller_get_devdata (mem->spi->controller);size_t max_len;if (op->data.dir ==SPI_MEM_DATA_IN ) {
@@ -606,7 +606,7 @@ static int ti_qspi_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)static int ti_qspi_exec_mem_op (struct spi_mem *mem,const struct spi_mem_op *op) { -struct ti_qspi *qspi =spi_master_get_devdata (mem->spi->master); +struct ti_qspi *qspi =spi_controller_get_devdata (mem->spi->controller);u32 from =0 ;int ret =0 ;
@@ -633,10 +633,10 @@ static int ti_qspi_exec_mem_op(struct spi_mem *mem,struct sg_table sgt;if (virt_addr_valid (op->data.buf.in) && - !spi_controller_dma_map_mem_op_data (mem->spi->master, op, + !spi_controller_dma_map_mem_op_data (mem->spi->controller, op, &sgt)) { ret =ti_qspi_dma_xfer_sg (qspi, sgt, from); -spi_controller_dma_unmap_mem_op_data (mem->spi->master, +spi_controller_dma_unmap_mem_op_data (mem->spi->controller, op, &sgt); }else { ret = ti_qspi_dma_bounce_buffer(qspi, from,
@@ -658,10 +658,10 @@ static const struct spi_controller_mem_ops ti_qspi_mem_ops = { .adjust_op_size = ti_qspi_adjust_op_size, }; -static int ti_qspi_start_transfer_one (struct spi_master *master, +static int ti_qspi_start_transfer_one (struct spi_controller *host,struct spi_message *m) { -struct ti_qspi *qspi =spi_master_get_devdata (master); +struct ti_qspi *qspi =spi_controller_get_devdata (host);struct spi_device *spi = m->spi;struct spi_transfer *t;int status =0 , ret;
@@ -720,7 +720,7 @@ static int ti_qspi_start_transfer_one(struct spi_master *master,ti_qspi_write (qspi, qspi->cmd |QSPI_INVAL ,QSPI_SPI_CMD_REG ); m->status = status; -spi_finalize_current_message (master); +spi_finalize_current_message (host);return status; }
@@ -756,33 +756,33 @@ MODULE_DEVICE_TABLE(of, ti_qspi_match);static int ti_qspi_probe (struct platform_device *pdev) {struct ti_qspi *qspi; -struct spi_master *master; +struct spi_controller *host;struct resource *r, *res_mmap;struct device_node *np = pdev->dev.of_node;u32 max_freq;int ret =0 , num_cs, irq;dma_cap_mask_t mask; - master =spi_alloc_master (&pdev->dev,sizeof (*qspi)); -if (!master) + host =spi_alloc_host (&pdev->dev,sizeof (*qspi)); +if (!host)return -ENOMEM ; - master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_RX_DUAL |SPI_RX_QUAD ; + host->mode_bits =SPI_CPOL |SPI_CPHA |SPI_RX_DUAL |SPI_RX_QUAD ; - master->flags =SPI_CONTROLLER_HALF_DUPLEX ; - master->setup = ti_qspi_setup; - master->auto_runtime_pm = true; - master->transfer_one_message = ti_qspi_start_transfer_one; - master->dev.of_node = pdev->dev.of_node; - master->bits_per_word_mask =SPI_BPW_MASK (32 ) |SPI_BPW_MASK (16 ) | -SPI_BPW_MASK (8 ); - master->mem_ops = &ti_qspi_mem_ops; + host->flags =SPI_CONTROLLER_HALF_DUPLEX ; + host->setup = ti_qspi_setup; + host->auto_runtime_pm = true; + host->transfer_one_message = ti_qspi_start_transfer_one; + host->dev.of_node = pdev->dev.of_node; + host->bits_per_word_mask =SPI_BPW_MASK (32 ) |SPI_BPW_MASK (16 ) | +SPI_BPW_MASK (8 ); + host->mem_ops = &ti_qspi_mem_ops;if (!of_property_read_u32 (np,"num-cs" , &num_cs)) - master->num_chipselect = num_cs; + host->num_chipselect = num_cs; - qspi =spi_master_get_devdata (master); - qspi->master = master; + qspi =spi_controller_get_devdata (host); + qspi->host = host; qspi->dev = &pdev->dev;platform_set_drvdata (pdev, qspi);
@@ -792,7 +792,7 @@ static int ti_qspi_probe(struct platform_device *pdev)if (r ==NULL ) {dev_err (&pdev->dev,"missing platform data\n" ); ret = -ENODEV ; - goto free_master; + goto free_host; } }
@@ -812,7 +812,7 @@ static int ti_qspi_probe(struct platform_device *pdev) irq =platform_get_irq (pdev,0 );if (irq <0 ) { ret = irq; - goto free_master; + goto free_host; }mutex_init (&qspi->list_lock);
@@ -820,7 +820,7 @@ static int ti_qspi_probe(struct platform_device *pdev) qspi->base =devm_ioremap_resource (&pdev->dev, r);if (IS_ERR (qspi->base)) { ret =PTR_ERR (qspi->base); - goto free_master; + goto free_host; }
@@ -830,7 +830,7 @@ static int ti_qspi_probe(struct platform_device *pdev) "syscon-chipselects");if (IS_ERR (qspi->ctrl_base)) { ret =PTR_ERR (qspi->ctrl_base); - goto free_master; + goto free_host; } ret = of_property_read_u32_index(np, "syscon-chipselects",
@@ -838,7 +838,7 @@ static int ti_qspi_probe(struct platform_device *pdev)if (ret) {dev_err (&pdev->dev,"couldn't get ctrl_mod reg index\n" ); - goto free_master; + goto free_host; } }
@@ -853,7 +853,7 @@ static int ti_qspi_probe(struct platform_device *pdev)pm_runtime_enable (&pdev->dev);if (!of_property_read_u32 (np,"spi-max-frequency" , &max_freq)) - master->max_speed_hz = max_freq; + host->max_speed_hz = max_freq;dma_cap_zero (mask);dma_cap_set (DMA_MEMCPY , mask);
@@ -876,7 +876,7 @@ static int ti_qspi_probe(struct platform_device *pdev)dma_release_channel (qspi->rx_chan); goto no_dma; } - master->dma_rx = qspi->rx_chan; + host->dma_rx = qspi->rx_chan;init_completion (&qspi->transfer_complete);if (res_mmap) qspi->mmap_phys_base = (dma_addr_t )res_mmap->start;
@@ -889,21 +889,21 @@ static int ti_qspi_probe(struct platform_device *pdev)"mmap failed with error %ld using PIO mode\n" , PTR_ERR(qspi->mmap_base)); qspi->mmap_base =NULL ; - master->mem_ops =NULL ; + host->mem_ops =NULL ; } } qspi->mmap_enabled = false; qspi->current_cs =-1 ; - ret =devm_spi_register_master (&pdev->dev, master); + ret =devm_spi_register_controller (&pdev->dev, host);if (!ret)return 0 ;ti_qspi_dma_cleanup (qspi);pm_runtime_disable (&pdev->dev); -free_master: -spi_master_put (master); +free_host: +spi_controller_put (host);return ret; }
@@ -912,9 +912,9 @@ static void ti_qspi_remove(struct platform_device *pdev)struct ti_qspi *qspi =platform_get_drvdata (pdev);int rc; - rc =spi_master_suspend (qspi->master); + rc =spi_controller_suspend (qspi->host);if (rc) { -dev_alert (&pdev->dev,"spi_master_suspend() failed (%pe)\n" , +dev_alert (&pdev->dev,"spi_controller_suspend() failed (%pe)\n" ,ERR_PTR (rc));return ; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 spi: ti-qspi: fix controller deregistration
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 0c18a1bacbb1d8b8aa34d3d004a2cb8226c8b1ea ]
Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind.
Note that the controller is suspended before disabling and releasing resources since commit 3ac066e2227c ("spi: spi-ti-qspi: Suspend the queue before removing the device") which avoids issues like unclocked accesses but prevents SPI device drivers from doing I/O during deregistration.
--- drivers/spi/spi-ti-qspi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/spi/spi-ti-qspi.c +6 -8
@@ -895,7 +895,7 @@ static int ti_qspi_probe(struct platform_device *pdev) qspi->mmap_enabled = false; qspi->current_cs =-1 ; - ret =devm_spi_register_controller (&pdev->dev, host); + ret =spi_register_controller (host);if (!ret)return 0 ;
@@ -910,19 +910,17 @@ static int ti_qspi_probe(struct platform_device *pdev)static void ti_qspi_remove (struct platform_device *pdev) {struct ti_qspi *qspi =platform_get_drvdata (pdev); -int rc; - rc =spi_controller_suspend (qspi->host); -if (rc) { -dev_alert (&pdev->dev,"spi_controller_suspend() failed (%pe)\n" , -ERR_PTR (rc)); -return ; - } +spi_controller_get (qspi->host); + +spi_unregister_controller (qspi->host);pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);ti_qspi_dma_cleanup (qspi); + +spi_controller_put (qspi->host); }static const struct dev_pm_ops ti_qspi_pm_ops = {
Signature · 1 line
2.53.0