From: Paul Cercueil <paul.cercueil@bootlin.com>
To: Mark Brown <broonie@kernel.org>
Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Bharat Bhushan <bbhushan2@marvell.com>,
Sunil Kovvuri Goutham <sgoutham@marvell.com>,
Tanmay Jagdale <tanmay@marvell.com>,
Jisheng Zhang <jszhang@kernel.org>,
George Cherian <gcherian@marvell.com>,
Witold Sadowski <wsadowski@marvell.com>,
stable@vger.kernel.org, Paul Cercueil <paul.cercueil@bootlin.com>
Subject: [PATCH v5 1/7] spi: cadence-xspi: Properly handle errors in .transfer_one_message
Date: Fri, 20 Nov 2026 12:59:19 +0100 [thread overview]
Message-ID: <20261120115925.173568-2-paul.cercueil@bootlin.com> (raw)
In-Reply-To: <20261120115925.173568-1-paul.cercueil@bootlin.com>
From: Tanmay Jagdale <tanmay@marvell.com>
The cdns_xspi_transfer_one_message_b0() function was not setting
m->status on error, causing it to be stuck at -EINPROGRESS, confusing
the SPI core.
Additionally, reset cdns_xspi->xfer_in_progress on error.
Fixes: 931e389ded0f ("spi: cadence: Add Marvell xfer operation support")
Cc: stable@vger.kernel.org
Signed-off-by: Tanmay Jagdale <tanmay@marvell.com>
Co-developed-by: Paul Cercueil <paul.cercueil@bootlin.com>
Signed-off-by: Paul Cercueil <paul.cercueil@bootlin.com>
---
v2: New patch
v3: No change
v4: Also reset cdns_xspi->xfer_in_progress on error.
v5: Reset hardware FIFO on error
---
drivers/spi/spi-cadence-xspi.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index 72852849ba27..e2d5d464bd30 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -1243,6 +1243,7 @@ static int cdns_xspi_transfer_one_message_b0(struct spi_controller *controller,
int current_transfer_len;
int cs = spi_get_chipselect(spi, 0);
int cs_change = 0;
+ int ret = -EIO;
/* Enable xfer state machine */
if (!cdns_xspi->xfer_in_progress) {
@@ -1283,7 +1284,7 @@ static int cdns_xspi_transfer_one_message_b0(struct spi_controller *controller,
false, cmd_regs);
cdns_xspi_trigger_command(cdns_xspi, cmd_regs);
if (!cdns_xspi_is_stig_ready(cdns_xspi, true))
- return -EIO;
+ goto out;
} else {
cdns_xspi_prepare_generic(cs, txd, 1, true, cmd_regs);
cdns_xspi_trigger_command(cdns_xspi, cmd_regs);
@@ -1292,11 +1293,11 @@ static int cdns_xspi_transfer_one_message_b0(struct spi_controller *controller,
cdns_xspi_trigger_command(cdns_xspi, cmd_regs);
cdns_xspi->sdma_xfer_len = current_transfer_len - 1;
if (!cdns_xspi_is_sdma_ready(cdns_xspi, true))
- return -EIO;
+ goto out;
if (cdns_xspi->sdma_handler(cdns_xspi))
- return -EIO;
+ goto out;
if (!cdns_xspi_is_stig_ready(cdns_xspi, true))
- return -EIO;
+ goto out;
if (rxd)
cdns_xspi->in_buffer += current_transfer_len;
@@ -1324,7 +1325,10 @@ static int cdns_xspi_transfer_one_message_b0(struct spi_controller *controller,
spi_transfer_delay_exec(t);
}
- if (!cs_change) {
+ ret = 0;
+
+out:
+ if (ret != 0 || !cs_change) {
u32 xfer_control = readl(cdns_xspi->xferbase + MRVL_XFER_FUNC_CTRL);
xfer_control &= ~(MRVL_XFER_RECEIVE_ENABLE |
@@ -1333,10 +1337,12 @@ static int cdns_xspi_transfer_one_message_b0(struct spi_controller *controller,
cdns_xspi->xfer_in_progress = false;
}
- m->status = 0;
+ if (m->status == -EINPROGRESS)
+ m->status = ret;
+
spi_finalize_current_message(controller);
- return 0;
+ return ret;
}
#endif
--
2.47.3
next prev parent reply other threads:[~2026-11-20 11:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 11:59 [PATCH v5 0/7] spi: cadence-xspi: Fixes and ACPI changes Paul Cercueil
2026-11-20 11:59 ` Paul Cercueil [this message]
2026-11-20 11:59 ` [PATCH v5 2/7] spi: cadence-xspi: Reconfigure to STIG mode before SPI message Paul Cercueil
2026-11-20 11:59 ` [PATCH v5 3/7] spi: cadence-xspi: Inform SPI core about size transferred Paul Cercueil
2026-11-20 11:59 ` [PATCH v5 4/7] spi: cadence-xspi: Clear "SDMA ready" IRQ flag after polling Paul Cercueil
2026-11-20 11:59 ` [PATCH v5 5/7] spi: cadence-xspi: Drop useless cdns_xspi->cur_cs Paul Cercueil
2026-11-20 11:59 ` [PATCH v5 6/7] spi: cadence-xspi: Rework resource discovery Paul Cercueil
2026-11-20 11:59 ` [PATCH v5 7/7] spi: cadence-xspi: Add workaround for old Marvell firmwares Paul Cercueil
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=20261120115925.173568-2-paul.cercueil@bootlin.com \
--to=paul.cercueil@bootlin.com \
--cc=bbhushan2@marvell.com \
--cc=broonie@kernel.org \
--cc=gcherian@marvell.com \
--cc=jszhang@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=sgoutham@marvell.com \
--cc=stable@vger.kernel.org \
--cc=tanmay@marvell.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=wsadowski@marvell.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®