mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
mmc: fsl_esdhc: Fix PIO timeout
The following error has been observed on i.MX25 with a high-speed SDSC card: Data Write Failed in PIO Mode. It was caused by the timeout set on PRSSTAT.BWEN, which was triggered because this bit takes 15 ms to be set after writing the first block to DATPORT with this card. Without this timeout, all the blocks are properly written. This timeout was implemented by decrementing a variable, so it was depending on the CPU frequency. Fix this issue by setting this timeout to a long enough absolute duration (500 ms). Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Jagan Teki <jagan@openedev.com>
This commit is contained in:
parent
cc65e354fe
commit
bcfb365375
2 changed files with 14 additions and 14 deletions
|
@ -171,20 +171,20 @@ static void esdhc_pio_read_write(struct fsl_esdhc_priv *priv,
|
|||
uint databuf;
|
||||
uint size;
|
||||
uint irqstat;
|
||||
uint timeout;
|
||||
ulong start;
|
||||
|
||||
if (data->flags & MMC_DATA_READ) {
|
||||
blocks = data->blocks;
|
||||
buffer = data->dest;
|
||||
while (blocks) {
|
||||
timeout = PIO_TIMEOUT;
|
||||
start = get_timer(0);
|
||||
size = data->blocksize;
|
||||
irqstat = esdhc_read32(®s->irqstat);
|
||||
while (!(esdhc_read32(®s->prsstat) & PRSSTAT_BREN)
|
||||
&& --timeout);
|
||||
if (timeout <= 0) {
|
||||
printf("\nData Read Failed in PIO Mode.");
|
||||
return;
|
||||
while (!(esdhc_read32(®s->prsstat) & PRSSTAT_BREN)) {
|
||||
if (get_timer(start) > PIO_TIMEOUT) {
|
||||
printf("\nData Read Failed in PIO Mode.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
while (size && (!(irqstat & IRQSTAT_TC))) {
|
||||
udelay(100); /* Wait before last byte transfer complete */
|
||||
|
@ -200,14 +200,14 @@ static void esdhc_pio_read_write(struct fsl_esdhc_priv *priv,
|
|||
blocks = data->blocks;
|
||||
buffer = (char *)data->src;
|
||||
while (blocks) {
|
||||
timeout = PIO_TIMEOUT;
|
||||
start = get_timer(0);
|
||||
size = data->blocksize;
|
||||
irqstat = esdhc_read32(®s->irqstat);
|
||||
while (!(esdhc_read32(®s->prsstat) & PRSSTAT_BWEN)
|
||||
&& --timeout);
|
||||
if (timeout <= 0) {
|
||||
printf("\nData Write Failed in PIO Mode.");
|
||||
return;
|
||||
while (!(esdhc_read32(®s->prsstat) & PRSSTAT_BWEN)) {
|
||||
if (get_timer(start) > PIO_TIMEOUT) {
|
||||
printf("\nData Write Failed in PIO Mode.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
while (size && (!(irqstat & IRQSTAT_TC))) {
|
||||
udelay(100); /* Wait before last byte transfer complete */
|
||||
|
|
|
@ -130,7 +130,7 @@
|
|||
#define XFERTYP_DMAEN 0x00000001
|
||||
|
||||
#define CINS_TIMEOUT 1000
|
||||
#define PIO_TIMEOUT 100000
|
||||
#define PIO_TIMEOUT 500
|
||||
|
||||
#define DSADDR 0x2e004
|
||||
|
||||
|
|
Loading…
Reference in a new issue