spi: cadence-quadspi: fix potential malfunction after ~49 days uptime
PATCH 1/1 spi: cadence-quadspi: fix potential malfunction after ~49 days uptime
From: Ronald Wahl <[email protected]>
The get_timer function returns an unsigned long which may be calculated from the ARM system counter. This counter is reset only on a cold reset. U-boot divides this counter down to a 1000 Hz counter that will cross the 32bit barrier after a bit more than 49 days. Assigning the value to an unsigned int will truncate it on 64bit systems.
Passing this truncated value back to the get_timer function will return a very large value that is certainly larger than the timeout and so will go down the error path and besides stopping U-Boot will lead to messages like
"SPI: QSPI is still busy after poll for 5000 ms."
--- drivers/spi/cadence_qspi_apb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/spi/cadence_qspi_apb.c +3 -3
@@ -151,9 +151,9 @@ static int cadence_qspi_set_protocol(struct cadence_spi_priv *priv,/* Return 1 if idle, otherwise return 0 (busy). */ static unsigned int cadence_qspi_wait_idle (void *reg_base) { -unsigned int start, count =0 ; +unsigned long start, count =0 ;/* timeout in unit of ms */ -unsigned int timeout =5000 ; +unsigned long timeout =5000 ; start =get_timer (0 );for ( ;get_timer (start) < timeout ; ) {
@@ -170,7 +170,7 @@ static unsigned int cadence_qspi_wait_idle(void *reg_base) }/* Timeout, still in busy mode. */ -printf ("QSPI: QSPI is still busy after poll for %d ms.\n" , timeout); +printf ("QSPI: QSPI is still busy after poll for %lu ms.\n" , timeout);return 0 ; }
--
2.47.1
+ tom and jagan
Quoted 12 lines · Ronald Wahl
From: Ronald Wahl <[email protected]>
The
get_timerfunction returns an unsigned long which may be calculated from the ARM system counter. This counter is reset only on a cold reset. U-boot divides this counter down to a 1000 Hz counter that will cross the 32bit barrier after a bit more than 49 days. Assigning the value to an unsigned int will truncate it on 64bit systems.
Passing this truncated value back to theget_timerfunction will return a very large value that is certainly larger than the timeout and so will go down the error path and besides stopping U-Boot will lead to messages like
Quoted 1 line
"SPI: QSPI is still busy after poll for 5000 ms."
Thanks a lot for fixing this!
Quoted 36 lines
Signed-off-by Ronald Wahl <[email protected]>Cc Vignesh R <[email protected]>Cc Pratyush Yadav <[email protected]>--- drivers/spi/cadence_qspi_apb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/spi/cadence_qspi_apb.c +3
-4@@ -151,9 +151,9 @@ static int cadence_qspi_set_protocol(struct cadence_spi_priv *priv,/* Return 1 if idle, otherwise return 0 (busy). */ static unsigned int cadence_qspi_wait_idle (void *reg_base) { -unsigned int start, count =0 ; +unsigned long start, count =0 ;/* timeout in unit of ms */ -unsigned int timeout =5000 ; +unsigned long timeout =5000 ; start =get_timer (0 );for ( ;get_timer (start) < timeout ; ) {@@ -170,7 +170,7 @@ static unsigned int cadence_qspi_wait_idle(void *reg_base) }/* Timeout, still in busy mode. */ -printf ("QSPI: QSPI is still busy after poll for %d ms.\n" , timeout); +printf ("QSPI: QSPI is still busy after poll for %lu ms.\n" , timeout);return 0 ; } --2.47.1
Signature · 3 lines
Regards Vignesh https://ti.com/opensource
Quoted 1 line · Vignesh Raghavendra
+ tom and jagan
Jagan seems to be missing. Does anyone know something?
There are a number of patches on patchwork waiting for approval or review.
Quoted 57 lines · Ronald Wahl
Quoted 12 lines
From: Ronald Wahl <[email protected]>
The
get_timerfunction returns an unsigned long which may be calculated from the ARM system counter. This counter is reset only on a cold reset. U-boot divides this counter down to a 1000 Hz counter that will cross the 32bit barrier after a bit more than 49 days. Assigning the value to an unsigned int will truncate it on 64bit systems.
Passing this truncated value back to theget_timerfunction will return a very large value that is certainly larger than the timeout and so will go down the error path and besides stopping U-Boot will lead to messages likeQuoted 1 line
"SPI: QSPI is still busy after poll for 5000 ms."
Thanks a lot for fixing this!
Reviewed-by Vignesh Raghavendra <[email protected]>Quoted 36 lines
Signed-off-by Ronald Wahl <[email protected]>Cc Vignesh R <[email protected]>Cc Pratyush Yadav <[email protected]>--- drivers/spi/cadence_qspi_apb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/spi/cadence_qspi_apb.c +3
-4@@ -151,9 +151,9 @@ static int cadence_qspi_set_protocol(struct cadence_spi_priv *priv,/* Return 1 if idle, otherwise return 0 (busy). */ static unsigned int cadence_qspi_wait_idle (void *reg_base) { -unsigned int start, count =0 ; +unsigned long start, count =0 ;/* timeout in unit of ms */ -unsigned int timeout =5000 ; +unsigned long timeout =5000 ; start =get_timer (0 );for ( ;get_timer (start) < timeout ; ) {@@ -170,7 +170,7 @@ static unsigned int cadence_qspi_wait_idle(void *reg_base) }/* Timeout, still in busy mode. */ -printf ("QSPI: QSPI is still busy after poll for %d ms.\n" , timeout); +printf ("QSPI: QSPI is still busy after poll for %lu ms.\n" , timeout);return 0 ; } --2.47.1
Quoted 11 lines · Ronald Wahl
The
get_timerfunction returns an unsigned long which may be calculated from the ARM system counter. This counter is reset only on a cold reset. U-boot divides this counter down to a 1000 Hz counter that will cross the 32bit barrier after a bit more than 49 days. Assigning the value to an unsigned int will truncate it on 64bit systems.
Passing this truncated value back to theget_timerfunction will return a very large value that is certainly larger than the timeout and so will go down the error path and besides stopping U-Boot will lead to messages like[...]
Applied to u-boot/master, thanks!
Signature · 1 line
Tom