arm: atmel_qspi: fix race condition in transfer completion check
Subsystems (2)
PATCH 1/1 arm: atmel_qspi: fix race condition in transfer completion check
In atmel_qspi_transfer(), the status register is polled with:
imr = QSPI_SR_INSTRE | QSPI_SR_CSR; return readl_poll_timeout(aq->regs + QSPI_SR, sr,
(sr & imr) == imr,
ATMEL_QSPI_TIMEOUT);However, this is racy: QSPI_SR_INSTRE can be set before QSPI_SR_CSR, and will then be cleared by the read. If that happens, the condition "(sr & imr) == imr" can never be true, and the function times out.
This race condition is avoided in at91bootstrap by accumulating the status bits across reads until both bits have been observed:
/* Poll INSTruction End and Chip Select Rise flags. */
imr = (QSPI_SR_INSTRE | QSPI_SR_CSR);
sr = 0;
do {
udelay(1);
sr |= qspi_readl(qspi, QSPI_SR) & imr;
} while ((--timeout) && (sr != imr));Update U-Boot's atmel_qspi_transfer() to use the same pattern, ensuring that both flags are observed even if they are not set simultaneously.
--- drivers/spi/atmel-quadspi.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/spi/atmel-quadspi.c +15 -2
@@ -616,6 +616,8 @@ static int atmel_qspi_transfer(struct atmel_qspi *aq, const struct spi_mem_op *op, u32 offset) {u32 sr, imr; +uint32_t val =0 ; +unsigned long timeout;/* Skip to the final steps if there is no data */ if (op->data.nbytes) {
@@ -636,8 +638,19 @@ static int atmel_qspi_transfer(struct atmel_qspi *aq,/* Poll INSTruction End and Chip Select Rise flags. */ imr =QSPI_SR_INSTRE |QSPI_SR_CSR ; -return readl_poll_timeout (aq->regs +QSPI_SR , sr, (sr & imr) == imr, -ATMEL_QSPI_TIMEOUT ); + + timeout =timer_get_us () +ATMEL_QSPI_TIMEOUT ; +while (1 ){ + val |=readl ( aq->regs +QSPI_SR ) & imr; +if ( ( val & imr ) == imr ){ +return 0 ; + } + +if (time_after (timer_get_us (), timeout)) { +return -ETIMEDOUT ; + } + } + } static int atmel_qspi_sama7g5_set_cfg(struct atmel_qspi *aq,
Signature · 1 line
2.50.1
Hello Ramin,
Thank you for your patch.
Can you please change the subject to have "spi: atmel_qspi: ..."
Quoted 45 lines · Ramin Moussavi
In
atmel_qspi_transfer(), the status register is polled with:imr =
QSPI_SR_INSTRE|QSPI_SR_CSR; return readl_poll_timeout(aq->regs +QSPI_SR, sr,(sr & imr) == imr, ATMEL_QSPI_TIMEOUT);However, this is racy:
QSPI_SR_INSTREcan be set beforeQSPI_SR_CSR, and will then be cleared by the read. If that happens, the condition "(sr & imr) == imr" can never be true, and the function times out.This race condition is avoided in at91bootstrap by accumulating the status bits across reads until both bits have been observed:
/* Poll INSTruction End and Chip Select Rise flags. */ imr = (QSPI_SR_INSTRE | QSPI_SR_CSR); sr = 0; do { udelay(1); sr |= qspi_readl(qspi, QSPI_SR) & imr; } while ((--timeout) && (sr != imr));Update U-Boot's
atmel_qspi_transfer()to use the same pattern, ensuring that both flags are observed even if they are not set simultaneously.Signed-off-by Ramin Seyed-Mousavi <[email protected]>--- drivers/spi/atmel-quadspi.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/spi/atmel-quadspi.c +2
-0@@ -616,6 +616,8 @@ static int atmel_qspi_transfer(struct atmel_qspi *aq, const struct spi_mem_op *op, u32 offset) {u32 sr, imr; +uint32_t val =0 ; +unsigned long timeout;/* Skip to the final steps if there is no data */ if (op->data.nbytes) {
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi *aq, · line 643
Quoted 8 lines
drivers/spi/atmel-quadspi.c +3
-2@@ -636,8 +638,19 @@ static int atmel_qspi_transfer(struct atmel_qspi *aq,/* Poll INSTruction End and Chip Select Rise flags. */ imr =QSPI_SR_INSTRE |QSPI_SR_CSR ; -return readl_poll_timeout (aq->regs +QSPI_SR , sr, (sr & imr) == imr, -ATMEL_QSPI_TIMEOUT ); + + timeout =timer_get_us () +ATMEL_QSPI_TIMEOUT ; +while (1 ){
There is a missing space, can you please run checkpatch tool and fix the warnings given ?
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi *aq, · line 645
Quoted 2 lines
drivers/spi/atmel-quadspi.c +2
-0+ val |=readl ( aq->regs +QSPI_SR ) & imr; +if ( ( val & imr ) == imr ){
Remove unnecessary brackets please, also spacing is odd
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi *aq, · line 649
Quoted 4 lines
drivers/spi/atmel-quadspi.c +4
-0+return 0 ; + } + +if (time_after (timer_get_us (), timeout)) {
Same here
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi *aq, · line 656
Quoted 7 lines
drivers/spi/atmel-quadspi.c +4
-0+return -ETIMEDOUT ; + } + } + } static int atmel_qspi_sama7g5_set_cfg(struct atmel_qspi *aq,
Eugen
Hello Eugen
here is the updated patch
Am Mo., 14. Juli 2025 um 22:33 Uhr schrieb Eugen Hristev < [email protected]>:
Quoted 82 lines
Hello Ramin,
Thank you for your patch.
Can you please change the subject to have "spi:
atmel_qspi: ..."drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi
Quoted 45 lines · Ramin Moussavi
In
atmel_qspi_transfer(), the status register is polled with:imr =
QSPI_SR_INSTRE|QSPI_SR_CSR; return readl_poll_timeout(aq->regs +QSPI_SR, sr,(sr & imr) == imr, ATMEL_QSPI_TIMEOUT);However, this is racy:
QSPI_SR_INSTREcan be set beforeQSPI_SR_CSR, and will then be cleared by the read. If that happens, the condition "(sr & imr) == imr" can never be true, and the function times out.This race condition is avoided in at91bootstrap by accumulating the status bits across reads until both bits have been observed:
/* Poll INSTruction End and Chip Select Rise flags. */ imr = (QSPI_SR_INSTRE | QSPI_SR_CSR); sr = 0; do { udelay(1); sr |= qspi_readl(qspi, QSPI_SR) & imr; } while ((--timeout) && (sr != imr));Update U-Boot's
atmel_qspi_transfer()to use the same pattern, ensuring that both flags are observed even if they are not set simultaneously.Signed-off-by Ramin Seyed-Mousavi <[email protected]>--- drivers/spi/atmel-quadspi.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/spi/atmel-quadspi.c +2
-0@@ -616,6 +616,8 @@ static int atmel_qspi_transfer(struct atmel_qspi *aq, const struct spi_mem_op *op, u32 offset) {u32 sr, imr; +uint32_t val =0 ; +unsigned long timeout;/* Skip to the final steps if there is no data */ if (op->data.nbytes) {@@ -636,8 +638,19 @@ static int atmel_qspi_transfer(struct atmel_qspi*aq,
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi · line 638
Quoted 4 lines
drivers/spi/atmel-quadspi.c +0
-1/* Poll INSTruction End and Chip Select Rise flags. */ imr =QSPI_SR_INSTRE |QSPI_SR_CSR ; - return readl_poll_timeout(aq->regs + QSPI_SR, sr, (sr & imr) ==imr,
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi · line 642
Quoted 4 lines
drivers/spi/atmel-quadspi.c +3
-1- ATMEL_QSPI_TIMEOUT); + + timeout =timer_get_us () +ATMEL_QSPI_TIMEOUT ; +while (1 ){There is a missing space, can you please run checkpatch tool and fix the warnings given ?
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi · line 644
Quoted 2 lines
drivers/spi/atmel-quadspi.c +2
-0+ val |=readl ( aq->regs +QSPI_SR ) & imr; +if ( ( val & imr ) == imr ){Remove unnecessary brackets please, also spacing is odd
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi · line 648
Quoted 4 lines
drivers/spi/atmel-quadspi.c +4
-0+return 0 ; + } + +if (time_after (timer_get_us (), timeout)) {Same here
Quoted 6 lines
drivers/spi/atmel-quadspi.c +4
-0+return -ETIMEDOUT ; + } + } + }
Quoted 5 lines
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi · line 655
Quoted 1 line
drivers/spi/atmel-quadspi.c +0
-0static int atmel_qspi_sama7g5_set_cfg(struct atmel_qspi *aq,Eugen
From f801dc67950f9c06d64c5a25f1fd2cb377c04919 Mon Sep 17 00:00:00 2001
From: Ramin Moussavi <[email protected]>
Date: Sun, 13 Jul 2025 17:43:31 +0200
Subject: [PATCH] arm: spi: atmel_qspi: fix race condition in transfer
completion check
In atmel_qspi_transfer(), the status register is polled with:
imr = QSPI_SR_INSTRE | QSPI_SR_CSR; return readl_poll_timeout(aq->regs + QSPI_SR, sr,
(sr & imr) == imr,
ATMEL_QSPI_TIMEOUT);However, this is racy: QSPI_SR_INSTRE can be set before QSPI_SR_CSR, and will then be cleared by the read. If that happens, the condition "(sr & imr) == imr" can never be true, and the function times out.
This race condition is avoided in at91bootstrap by accumulating the status bits across reads until both bits have been observed:
/* Poll INSTruction End and Chip Select Rise flags. */
imr = (QSPI_SR_INSTRE | QSPI_SR_CSR);
sr = 0;
do {
udelay(1);
sr |= qspi_readl(qspi, QSPI_SR) & imr;
} while ((--timeout) && (sr != imr));Update U-Boot's atmel_qspi_transfer() to use the same pattern, ensuring that both flags are observed even if they are not set simultaneously.
--- drivers/spi/atmel-quadspi.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/spi/atmel-quadspi.c +12 -2
@@ -616,6 +616,8 @@ static int atmel_qspi_transfer(struct atmel_qspi *aq, const struct spi_mem_op *op, u32 offset) {u32 sr, imr; +u32 val =0 ; +unsigned long timeout;/* Skip to the final steps if there is no data */ if (op->data.nbytes) {
@@ -636,8 +638,16 @@ static int atmel_qspi_transfer(struct atmel_qspi *aq,/* Poll INSTruction End and Chip Select Rise flags. */ imr =QSPI_SR_INSTRE |QSPI_SR_CSR ; -return readl_poll_timeout (aq->regs +QSPI_SR , sr, (sr & imr) == imr, -ATMEL_QSPI_TIMEOUT ); + + timeout =timer_get_us () +ATMEL_QSPI_TIMEOUT ; +while (1 ) { + val |=readl (aq->regs +QSPI_SR ) & imr; +if ((val & imr) == imr) +return 0 ; + +if (time_after (timer_get_us (), timeout)) +return -ETIMEDOUT ; + } } static int atmel_qspi_sama7g5_set_cfg(struct atmel_qspi *aq,
Signature · 1 line
2.50.1
Quoted 3 lines · Ramin Moussavi
Hello Eugen
here is the updated patch
Please do not attach the patch to the email. Just create the patch using git format-patch -v 2 and then use git send-email to send the patch.
We will review it after you send it like that.
Thanks
Quoted 92 lines
Am Mo., 14. Juli 2025 um 22:33 Uhr schrieb Eugen Hristev < [email protected]>:
Quoted 87 lines
Hello Ramin,
Thank you for your patch.
Can you please change the subject to have "spi:
atmel_qspi: ..."drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi
Quoted 45 lines · Ramin Moussavi
In
atmel_qspi_transfer(), the status register is polled with:imr =
QSPI_SR_INSTRE|QSPI_SR_CSR; return readl_poll_timeout(aq->regs +QSPI_SR, sr,(sr & imr) == imr, ATMEL_QSPI_TIMEOUT);However, this is racy:
QSPI_SR_INSTREcan be set beforeQSPI_SR_CSR, and will then be cleared by the read. If that happens, the condition "(sr & imr) == imr" can never be true, and the function times out.This race condition is avoided in at91bootstrap by accumulating the status bits across reads until both bits have been observed:
/* Poll INSTruction End and Chip Select Rise flags. */ imr = (QSPI_SR_INSTRE | QSPI_SR_CSR); sr = 0; do { udelay(1); sr |= qspi_readl(qspi, QSPI_SR) & imr; } while ((--timeout) && (sr != imr));Update U-Boot's
atmel_qspi_transfer()to use the same pattern, ensuring that both flags are observed even if they are not set simultaneously.Signed-off-by Ramin Seyed-Mousavi <[email protected]>--- drivers/spi/atmel-quadspi.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/spi/atmel-quadspi.c +2
-0@@ -616,6 +616,8 @@ static int atmel_qspi_transfer(struct atmel_qspi *aq, const struct spi_mem_op *op, u32 offset) {u32 sr, imr; +uint32_t val =0 ; +unsigned long timeout;/* Skip to the final steps if there is no data */ if (op->data.nbytes) {@@ -636,8 +638,19 @@ static int atmel_qspi_transfer(struct atmel_qspi*aq,
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi *aq,
Quoted 4 lines
drivers/spi/atmel-quadspi.c +0
-1/* Poll INSTruction End and Chip Select Rise flags. */ imr =QSPI_SR_INSTRE |QSPI_SR_CSR ; - return readl_poll_timeout(aq->regs + QSPI_SR, sr, (sr & imr) ==imr,
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi *aq,
Quoted 4 lines
drivers/spi/atmel-quadspi.c +3
-1- ATMEL_QSPI_TIMEOUT); + + timeout =timer_get_us () +ATMEL_QSPI_TIMEOUT ; +while (1 ){There is a missing space, can you please run checkpatch tool and fix the warnings given ?
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi · line 644
Quoted 2 lines
drivers/spi/atmel-quadspi.c +2
-0+ val |=readl ( aq->regs +QSPI_SR ) & imr; +if ( ( val & imr ) == imr ){Remove unnecessary brackets please, also spacing is odd
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi *aq,
Quoted 4 lines
drivers/spi/atmel-quadspi.c +4
-0+return 0 ; + } + +if (time_after (timer_get_us (), timeout)) {Same here
drivers/spi/atmel-quadspi.c static int atmel_qspi_transfer(struct atmel_qspi *aq, · line 653
Quoted 7 lines
drivers/spi/atmel-quadspi.c +4
-0+return -ETIMEDOUT ; + } + } + } static int atmel_qspi_sama7g5_set_cfg(struct atmel_qspi *aq,Eugen