Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f

Authored by Rajeshwari Shinde
Committed by Minkyu Kang
1 parent eeb7d6a238
Exists in master and in 56 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.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-m6.0.1_2.1.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, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, 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, v2017.01-smarct4x

MMC: DWMMC: Fix FIFO_DEPTH calculation 

Current DWMMC driver used to give FIFO underrun/overrun error every 3rd time
for mmc rescan command.
In current code FIFO_DEPTH is getting calculated after reading the default FIFOTH
register and extracting the RX_WMARK bits from it i.e (RX_WMARK = FIFO_DEPTH/2 -1).
Instead of storing the correct value, we were recalculating the FIFO_DEPT each
time which is not correct.

Based on "[PATCH V9 3/9] DWMMC: Initialise dwmci and resolve EMMC read write issues"
http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/160247

Signed-off-by: Hatim Ali <hatim.rv@samsung.com>
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

Showing 1 changed file with 6 additions and 8 deletions Side-by-side Diff

drivers/mmc/dw_mmc.c
Diff comments   View file @ ed7bdc0
... ... @@ -312,7 +312,7 @@
312 312 static int dwmci_init(struct mmc *mmc)
313 313 {
314 314 struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
315   - u32 fifo_size, fifoth_val;
  315 + u32 fifo_size;
316 316  
317 317 dwmci_writel(host, DWMCI_PWREN, 1);
318 318  
319 319  
... ... @@ -332,15 +332,13 @@
332 332 dwmci_writel(host, DWMCI_IDINTEN, 0);
333 333 dwmci_writel(host, DWMCI_BMOD, 1);
334 334  
335   - fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
336   - fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
337   - if (host->fifoth_val) {
338   - fifoth_val = host->fifoth_val;
339   - } else {
340   - fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
  335 + if (!host->fifoth_val) {
  336 + fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
  337 + fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
  338 + host->fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
341 339 TX_WMARK(fifo_size / 2);
342 340 }
343   - dwmci_writel(host, DWMCI_FIFOTH, fifoth_val);
  341 + dwmci_writel(host, DWMCI_FIFOTH, host->fifoth_val);
344 342  
345 343 dwmci_writel(host, DWMCI_CLKENA, 0);
346 344 dwmci_writel(host, DWMCI_CLKSRC, 0);