Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit cc17c01f2d3b691ddadbd46727d5f22db0a90808

Authored by Andrew Gabbasov
Committed by Pantelis Antoniou
1 parent 5289b5350b
Exists in v2017.01-smarct4x and in 34 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

mmc: Continue polling MMC card for OCR only if it is still not ready 

Some MMC cards come to ready state quite quickly, so that the respective
flag appears to be set in mmc_send_op_cond already. In this case trying
to continue polling the card with CMD1 in mmc_complete_op_cond is incorrect
and may lead to unpredictable results. So check the flag before polling
and skip it appropriately.

Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>

Showing 1 changed file with 11 additions and 9 deletions Side-by-side Diff

... ... @@ -403,15 +403,17 @@
403 403 int err;
404 404  
405 405 mmc->op_cond_pending = 0;
406   - start = get_timer(0);
407   - do {
408   - err = mmc_send_op_cond_iter(mmc, 1);
409   - if (err)
410   - return err;
411   - if (get_timer(start) > timeout)
412   - return UNUSABLE_ERR;
413   - udelay(100);
414   - } while (!(mmc->ocr & OCR_BUSY));
  406 + if (!(mmc->ocr & OCR_BUSY)) {
  407 + start = get_timer(0);
  408 + do {
  409 + err = mmc_send_op_cond_iter(mmc, 1);
  410 + if (err)
  411 + return err;
  412 + if (get_timer(start) > timeout)
  413 + return UNUSABLE_ERR;
  414 + udelay(100);
  415 + } while (!(mmc->ocr & OCR_BUSY));
  416 + }
415 417  
416 418 if (mmc_host_is_spi(mmc)) { /* read OCR for spi */
417 419 cmd.cmdidx = MMC_CMD_SPI_READ_OCR;