[PATCH 05/10] spi: topcliff-pch: Advance tx_buf between DMA chunks

From: Lee Jones

Date: Thu Nov 19 2026 - 04:19:03 EST


In DMA mode, pch_spi_process_messages() splits transfers larger than
PCH_BUF_SIZE into chunks and calls pch_spi_handle_dma() once per chunk.
pch_spi_handle_dma() copies the TX data through a local pointer and
never stores the advanced position back into the transfer, so every
chunk after the first retransmits the data from the first chunk.

The RX side already writes its advanced pointer back and restores the
original rx_buf once the transfer is complete.

Do the same for tx_buf, so that each chunk sends the correct slice of
the buffer, and restore the original tx_buf once the transfer has
completed or failed.

Advancing tx_buf by the number of bytes copied relies on the following
commit, which ensures that each chunk covers no more than the bytes
accounted for by the loop in pch_spi_process_messages():

commit 3515e312e096 ("spi: topcliff-pch: clamp DMA bpw_len by bytes not words")

Fixes: 7d05b3e868ee ("spi-topcliff-pch: Fix issue for transmitting over 4KByte")
Closes: https://sashiko.dev/#/bug/linux-625e2f07-fb68-446b-b1a8-b1f66aacb62e
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
---
drivers/spi/spi-topcliff-pch.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 0bec3012a6bc..cbe76c4ae2e8 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -947,11 +947,13 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw)
tx_dma_buf = dma->tx_buf_virt;
for (i = 0; i < data->bpw_len; i++)
*tx_dma_buf++ = *tx_buf++;
+ data->cur_trans->tx_buf = tx_buf;
} else {
tx_sbuf = data->cur_trans->tx_buf;
tx_dma_sbuf = dma->tx_buf_virt;
for (i = 0; i < data->bpw_len; i++)
*tx_dma_sbuf++ = *tx_sbuf++;
+ data->cur_trans->tx_buf = tx_sbuf;
}
}

@@ -1180,10 +1182,12 @@ static void pch_spi_process_messages(struct work_struct *pwork)
if (data->use_dma) {
int i;
char *save_rx_buf = data->cur_trans->rx_buf;
+ const void *save_tx_buf = data->cur_trans->tx_buf;

for (i = 0; i < cnt; i++) {
pch_spi_handle_dma(data, &bpw);
if (!pch_spi_start_transfer(data)) {
+ data->cur_trans->tx_buf = save_tx_buf;
data->transfer_complete = true;
data->current_msg->status = -EIO;
data->current_msg->complete
@@ -1196,6 +1200,7 @@ static void pch_spi_process_messages(struct work_struct *pwork)
pch_spi_copy_rx_data_for_dma(data, bpw);
}
data->cur_trans->rx_buf = save_rx_buf;
+ data->cur_trans->tx_buf = save_tx_buf;
} else {
pch_spi_set_tx(data, &bpw);
pch_spi_set_ir(data);
--
2.56.1.708.g77570a6a1d-goog