leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: Fix timeout values passed to mmc_wait_dat0()

Browse Source 
mmc_wait_dat0() expects timeout argument to be in usec units. But some
overlying functions operate on timeout in msec units. Convert timeout
from msec to usec when passing it to mmc_wait_dat0().

This fixes 'avb' commands on BeagleBoard X15, because next chain was
failing:

    get_partition() -> mmc_switch_part() -> __mmc_switch() ->
    mmc_wait_dat0()

when passing incorrect timeout from __mmc_switch() to mmc_wait_dat0().

Fixes: bb98b8c5c0 ("mmc: During a switch, poll on dat0 if available and check the final status")
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>
Tested-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Igor Opaniuk <igor.opaniuk@gmail.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@gmail.com>
This commit is contained in:
Sam Protsenko 2019-08-14 22:52:50 +03:00 committed by Peng Fan
parent 701a51e1ef
commit 116cffeca6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/mmc.c
View File

@ -235,7 +235,7 @@ int mmc_poll_for_busy(struct mmc *mmc, int timeout)
unsigned int status;
int err;
err = mmc_wait_dat0(mmc, 1, timeout);
err = mmc_wait_dat0(mmc, 1, timeout * 1000);
if (err != -ENOSYS)
return err;
@ -778,7 +778,7 @@ static int __mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value,
start = get_timer(0);
/* poll dat0 for rdy/buys status */
ret = mmc_wait_dat0(mmc, 1, timeout);
ret = mmc_wait_dat0(mmc, 1, timeout * 1000);
if (ret && ret != -ENOSYS)
return ret;