diff mbox series

spi: atmel-qspi: Memory barriers after memory-mapped I/O

Message ID 20241218165850.378909-1-csokas.bence@prolan.hu
State Superseded
Headers show
Series spi: atmel-qspi: Memory barriers after memory-mapped I/O | expand

Commit Message

Bence Csókás Dec. 18, 2024, 4:58 p.m. UTC
The QSPI peripheral control and status registers are
accessible via the SoC's APB bus, whereas MMIO transactions'
data travels on the AHB bus.

Microchip documentation and even sample code from Atmel
emphasises the need for a memory barrier before the first
MMIO transaction to the AHB-connected QSPI, and before the
last write to its registers via APB. This is achieved by
the following lines in `atmel_qspi_transfer()`:

	/* Dummy read of QSPI_IFR to synchronize APB and AHB accesses */
	(void)atmel_qspi_read(aq, QSPI_IFR);

However, the current documentation makes no mention to
synchronization requirements in the other direction, i.e.
after the last data written via AHB, and before the first
register access on APB.

---

In our case, we were facing an issue where the QSPI peripheral
would cease to send any new CSR (nCS Rise) interrupts,
leading to a timeout in `atmel_qspi_wait_for_completion()`
and ultimately this panic in higher levels:

	ubi0 error: ubi_io_write: error -110 while writing 63108 bytes to PEB 491:128, written 63104 bytes

After months of extensive research of the codebase, fiddling
around the debugger with kgdb, and back-and-forth with
Microchip, we came to the conclusion that the issue is
probably that the peripheral is still busy receiving on AHB
when the LASTXFER bit is written to its Control Register
on APB, therefore this write gets lost, and the peripheral
still thinks there is more data to come in the MMIO transfer.
This was first formulated when we noticed that doubling the
write() of QSPI_CR_LASTXFER seemed to solve the problem.

Ultimately, the solution is to introduce memory barriers
after the AHB-mapped MMIO transfers, to ensure ordering.

Fixes: d5433def3153 ("mtd: spi-nor: atmel-quadspi: Add spi-mem support to atmel-quadspi")
Cc: Hari.PrasathGE@microchip.com
Cc: Mahesh.Abotula@microchip.com
Cc: Marco.Cardellini@microchip.com
Cc: <stable@vger.kernel.org> # c0a0203cf579: ("spi: atmel-quadspi: Create `atmel_qspi_ops`"...)
Cc: <stable@vger.kernel.org> # 6.x.y
Signed-off-by: Bence Csókás <csokas.bence@prolan.hu>
---
 drivers/spi/atmel-quadspi.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Mark Brown Dec. 18, 2024, 5:01 p.m. UTC | #1
On Wed, Dec 18, 2024 at 05:58:49PM +0100, Bence Csókás wrote:

> However, the current documentation makes no mention to
> synchronization requirements in the other direction, i.e.
> after the last data written via AHB, and before the first
> register access on APB.
> 
> ---
> 
> Fixes: d5433def3153 ("mtd: spi-nor: atmel-quadspi: Add spi-mem support to atmel-quadspi")
> Cc: Hari.PrasathGE@microchip.com
> Cc: Mahesh.Abotula@microchip.com
> Cc: Marco.Cardellini@microchip.com
> Cc: <stable@vger.kernel.org> # c0a0203cf579: ("spi: atmel-quadspi: Create `atmel_qspi_ops`"...)
> Cc: <stable@vger.kernel.org> # 6.x.y
> Signed-off-by: Bence Csókás <csokas.bence@prolan.hu>
> ---

Your signoffs and whatnot need to go before the --- so they don't get
cut off by tools, any any ancilliary stuff should go after.
Bence Csókás Dec. 19, 2024, 9:09 a.m. UTC | #2
Right. I originally planned on splitting it into a cover letter and then 
the patch, but I guess everything can just go into the msg. Dropping the ---

Bence

On 2024. 12. 18. 18:01, Mark Brown wrote:
> On Wed, Dec 18, 2024 at 05:58:49PM +0100, Bence Csókás wrote:
> 
>> However, the current documentation makes no mention to
>> synchronization requirements in the other direction, i.e.
>> after the last data written via AHB, and before the first
>> register access on APB.
>>
>> ---
>>
>> Fixes: d5433def3153 ("mtd: spi-nor: atmel-quadspi: Add spi-mem support to atmel-quadspi")
>> Cc: Hari.PrasathGE@microchip.com
>> Cc: Mahesh.Abotula@microchip.com
>> Cc: Marco.Cardellini@microchip.com
>> Cc: <stable@vger.kernel.org> # c0a0203cf579: ("spi: atmel-quadspi: Create `atmel_qspi_ops`"...)
>> Cc: <stable@vger.kernel.org> # 6.x.y
>> Signed-off-by: Bence Csókás <csokas.bence@prolan.hu>
>> ---
> 
> Your signoffs and whatnot need to go before the --- so they don't get
> cut off by tools, any any ancilliary stuff should go after.
diff mbox series

Patch

diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 73cf0c3f1477..96fc1c56a221 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -625,13 +625,20 @@  static int atmel_qspi_transfer(struct spi_mem *mem,
 	(void)atmel_qspi_read(aq, QSPI_IFR);
 
 	/* Send/Receive data */
-	if (op->data.dir == SPI_MEM_DATA_IN)
+	if (op->data.dir == SPI_MEM_DATA_IN) {
 		memcpy_fromio(op->data.buf.in, aq->mem + offset,
 			      op->data.nbytes);
-	else
+
+		/* Synchronize AHB and APB accesses again */
+		rmb();
+	} else {
 		memcpy_toio(aq->mem + offset, op->data.buf.out,
 			    op->data.nbytes);
 
+		/* Synchronize AHB and APB accesses again */
+		wmb();
+	}
+
 	/* Release the chip-select */
 	atmel_qspi_write(QSPI_CR_LASTXFER, aq, QSPI_CR);