From: Lee Jones <lee@kernel.org>
To: lee@kernel.org, Han Xu <han.xu@nxp.com>,
Mark Brown <broonie@kernel.org>,
Boris Brezillon <bbrezillon@kernel.org>,
Frieder Schrempf <frieder.schrempf@kontron.de>,
Yogesh Gaur <yogeshnarayan.gaur@nxp.com>,
Suresh Gupta <suresh.gupta@nxp.com>,
linux-spi@vger.kernel.org, imx@lists.linux.dev,
linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: [PATCH 08/10] spi: fsl-qspi: Propagate clock errors from fsl_qspi_select_mem()
Date: Thu, 19 Nov 2026 09:17:20 +0000 [thread overview]
Message-ID: <20261119091810.3440619-9-lee@kernel.org> (raw)
In-Reply-To: <20261119091810.3440619-1-lee@kernel.org>
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@vger.kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
---
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
next prev parent reply other threads:[~2026-11-19 9:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 9:17 [PATCH 00/10] spi: Fix data corruption, uninitialised data leaks and bounds checks Lee Jones
2026-11-19 9:17 ` [PATCH 01/10] spi: fsl-cpm: Map the zero page's address, not its struct page Lee Jones
2026-11-19 9:17 ` [PATCH 02/10] spi: bcm2835: Store native chip-select GPIO descriptor per device Lee Jones
2026-11-19 9:17 ` [PATCH 03/10] spi: ch341: Limit transfers to the hardware packet size Lee Jones
2026-11-19 9:17 ` [PATCH 04/10] spi: sprd-adi: Do not copy uninitialised data to rx_buf on read failure Lee Jones
2026-11-19 9:17 ` [PATCH 05/10] spi: topcliff-pch: Advance tx_buf between DMA chunks Lee Jones
2026-11-19 9:17 ` [PATCH 06/10] spi: cadence-quadspi: Bound chip select against f_pdata array size Lee Jones
2026-11-19 10:15 ` Théo Lebrun
2026-11-19 14:33 ` Lee Jones
2026-11-19 14:55 ` Théo Lebrun
2026-11-19 15:32 ` Lee Jones
2026-11-19 9:17 ` [PATCH 07/10] spi: cadence-xspi: Zero the tail word in m_iowriteq() Lee Jones
2026-11-19 9:17 ` Lee Jones [this message]
2026-11-19 9:17 ` [PATCH 09/10] spi: cadence-xspi: Advance tx pointer between Marvell b0 chunks Lee Jones
2026-11-19 9:17 ` [PATCH 10/10] spi: cadence-xspi: Skip tail read for qword-aligned Marvell b0 receives Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119091810.3440619-9-lee@kernel.org \
--to=lee@kernel.org \
--cc=bbrezillon@kernel.org \
--cc=broonie@kernel.org \
--cc=frieder.schrempf@kontron.de \
--cc=han.xu@nxp.com \
--cc=imx@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=suresh.gupta@nxp.com \
--cc=yogeshnarayan.gaur@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.