[PATCH 08/10] spi: fsl-qspi: Propagate clock errors from fsl_qspi_select_mem()
From: Lee Jones
Date: Thu Nov 19 2026 - 04:19:43 EST
fsl_qspi_select_mem() returns void and silently gives up if either
clk_set_rate() or fsl_qspi_clk_prep_enable() fails. fsl_qspi_exec_op()
then carries on with the operation regardless.
When switching between devices, a failed rate change leaves q->selected
pointing at the previously selected chip, so the operation is issued
through the previous device's SFAR and AHB window. If the failure
happens on the first operation, q->selected is still -1 from probe, so
those offsets are derived from a negative chip select. On controllers
which need the clocks disabled while the rate is changed, a
clk_set_rate() failure also leaves the clocks off while registers
continue to be accessed.
Re-enable the clocks even when setting the rate failed, return any error
to the caller, and have fsl_qspi_exec_op() abort the operation when
selecting the device fails.
Fixes: 84d043185dbe ("spi: Add a driver for the Freescale/NXP QuadSPI controller")
Closes: https://sashiko.dev/#/bug/linux-719261ef-312e-4a94-9a84-fd42a411bee0
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
---
drivers/spi/spi-fsl-qspi.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c
index d2c2090442f8..30f39adb5a6b 100644
--- a/drivers/spi/spi-fsl-qspi.c
+++ b/drivers/spi/spi-fsl-qspi.c
@@ -546,15 +546,15 @@ static void fsl_qspi_invalidate(struct fsl_qspi *q)
qspi_writel(q, reg, q->iobase + QUADSPI_MCR);
}
-static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_device *spi,
- const struct spi_mem_op *op)
+static int fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_device *spi,
+ const struct spi_mem_op *op)
{
unsigned long rate = op->max_freq;
int ret;
if (q->selected == spi_get_chipselect(spi, 0) &&
q->selected_freq == op->max_freq)
- return;
+ return 0;
if (needs_4x_clock(q))
rate *= 4;
@@ -563,19 +563,24 @@ static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_device *spi,
fsl_qspi_clk_disable_unprep(q);
ret = clk_set_rate(q->clk, rate);
- if (ret)
- return;
if (needs_clk_disable(q)) {
- ret = fsl_qspi_clk_prep_enable(q);
- if (ret)
- return;
+ int err;
+
+ err = fsl_qspi_clk_prep_enable(q);
+ if (!ret)
+ ret = err;
}
+ if (ret)
+ return ret;
+
q->selected = spi_get_chipselect(spi, 0);
q->selected_freq = op->max_freq;
fsl_qspi_invalidate(q);
+
+ return 0;
}
static void fsl_qspi_read_ahb(struct fsl_qspi *q, const struct spi_mem_op *op)
@@ -682,7 +687,9 @@ static int fsl_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
fsl_qspi_readl_poll_tout(q, base + QUADSPI_SR, (QUADSPI_SR_IP_ACC_MASK |
QUADSPI_SR_AHB_ACC_MASK), 10, 1000);
- fsl_qspi_select_mem(q, mem->spi, op);
+ err = fsl_qspi_select_mem(q, mem->spi, op);
+ if (err)
+ goto out_unlock;
if (needs_amba_base_offset(q))
addr_offset = q->memmap_phy;
@@ -725,6 +732,7 @@ static int fsl_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
/* Invalidate the data in the AHB buffer. */
fsl_qspi_invalidate(q);
+out_unlock:
mutex_unlock(&q->lock);
return err;
--
2.56.1.708.g77570a6a1d-goog