Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cda56ac29f2d8288d62978272856884d26e0b47b

Authored by Adrian Hunter
Committed by Pierre Ossman
1 parent 559595a985
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.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_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

mmc: fix data timeout for SEND_EXT_CSD 

Commit 0d3e0460f307e84904968aad6cff97bd688583d8
"MMC: CSD and CID timeout values" inadvertently broke
the timeout for the MMC command SEND_EXT_CSD.

This patch puts it back again.

Depending on the characteristics of the controller,
this bug may prevent the use of MMC cards.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

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

drivers/mmc/core/mmc_ops.c
Diff comments   View file @ cda56ac
... ... @@ -248,12 +248,15 @@
248 248  
249 249 sg_init_one(&sg, data_buf, len);
250 250  
251   - /*
252   - * The spec states that CSR and CID accesses have a timeout
253   - * of 64 clock cycles.
254   - */
255   - data.timeout_ns = 0;
256   - data.timeout_clks = 64;
  251 + if (opcode == MMC_SEND_CSD || opcode == MMC_SEND_CID) {
  252 + /*
  253 + * The spec states that CSR and CID accesses have a timeout
  254 + * of 64 clock cycles.
  255 + */
  256 + data.timeout_ns = 0;
  257 + data.timeout_clks = 64;
  258 + } else
  259 + mmc_set_data_timeout(&data, card);
257 260  
258 261 mmc_wait_for_req(host, &mrq);
259 262