mmc: core: Do not change frequency before switch from HS400
cover mmc: core: Do not change frequency before switch from HS400
Hi
Patches to improve mmc_hs400_to_hs200() as discussed here:
https://lore.kernel.org/linux-mmc/[email protected]/
Adrian Hunter (3):
mmc: core: Try harder if transfer mode switch fails
mmc: core: Do not check CRC response for switch from HS400 to HS200
mmc: core: Do not change frequency before switch from HS400
drivers/mmc/core/mmc.c | 41 ++++++++++++++++++++++++----------------- drivers/mmc/core/mmc_ops.c | 13 +++++++++++-- drivers/mmc/core/mmc_ops.h | 2 +- 3 files changed, 36 insertions(+), 20 deletions(-)
Regards
Adrian
RFC PATCH 1/3 mmc: core: Try harder if transfer mode switch fails
Add extra busy wait and retries if transfer mode switch fails.
--- drivers/mmc/core/mmc_ops.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mmc/core/mmc_ops.c +6 -0
@@ -599,6 +599,12 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, cmd.sanitize_busy = true; err =mmc_wait_for_cmd (host, &cmd,MMC_CMD_RETRIES ); +if (err && index ==EXT_CSD_HS_TIMING ) { +/* Try harder for timing changes */ +__mmc_poll_for_busy (card, timeout_ms, send_status, + retry_crc_err,MMC_BUSY_CMD6 ); + err =mmc_wait_for_cmd (host, &cmd,MMC_CMD_RETRIES ); + }if (err) goto out;
Signature · 1 line
2.17.1
RFC PATCH 2/3 mmc: core: Do not check CRC response for switch from HS400 to HS200
In reply to Adrian HunterSwitching from HS400 to HS200 may experience CRC errors. Do not check CRC response in that case.
--- drivers/mmc/core/mmc.c | 22 +++++++++++----------- drivers/mmc/core/mmc_ops.c | 7 +++++-- drivers/mmc/core/mmc_ops.h | 2 +- 3 files changed, 17 insertions(+), 14 deletions(-)
drivers/mmc/core/mmc.c +11 -11
@@ -1055,7 +1055,7 @@ static int mmc_select_hs(struct mmc_card *card) err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING ,EXT_CSD_TIMING_HS , card->ext_csd.generic_cmd6_time,MMC_TIMING_MMC_HS , - true, true); + true, true, false);if (err)pr_warn ("%s: switch to high-speed failed, err:%d\n" ,mmc_hostname (card->host), err);
@@ -1087,7 +1087,7 @@ static int mmc_select_hs_ddr(struct mmc_card *card) ext_csd_bits, card->ext_csd.generic_cmd6_time,MMC_TIMING_MMC_DDR52 , - true, true); + true, true, false);if (err) {pr_err ("%s: switch to bus width %d ddr failed\n" ,mmc_hostname (host),1 << bus_width);
@@ -1155,7 +1155,7 @@ static int mmc_select_hs400(struct mmc_card *card) err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING , val, card->ext_csd.generic_cmd6_time,0 , - false, true); + false, true, false);if (err) {pr_err ("%s: switch to high-speed from hs200 failed, err:%d\n" ,mmc_hostname (host), err);
@@ -1197,7 +1197,7 @@ static int mmc_select_hs400(struct mmc_card *card) err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING , val, card->ext_csd.generic_cmd6_time,0 , - false, true); + false, true, false);if (err) {pr_err ("%s: switch to hs400 failed, err:%d\n" ,mmc_hostname (host), err);
@@ -1243,7 +1243,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) val =EXT_CSD_TIMING_HS ; err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING , val, card->ext_csd.generic_cmd6_time,0 , - false, true); + false, true, true);if (err) goto out_err;
@@ -1256,7 +1256,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card)/* Switch HS DDR to HS */ err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_BUS_WIDTH ,EXT_CSD_BUS_WIDTH_8 , card->ext_csd.generic_cmd6_time, -0 , false, true); +0 , false, true, false);if (err) goto out_err;
@@ -1274,7 +1274,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) card->drive_strength <<EXT_CSD_DRV_STR_SHIFT ; err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING , val, card->ext_csd.generic_cmd6_time,0 , - false, true); + false, true, false);if (err) goto out_err;
@@ -1358,7 +1358,7 @@ static int mmc_select_hs400es(struct mmc_card *card) err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING ,EXT_CSD_TIMING_HS , card->ext_csd.generic_cmd6_time,0 , - false, true); + false, true, false);if (err) {pr_err ("%s: switch to hs for hs400es failed, err:%d\n" ,mmc_hostname (host), err);
@@ -1392,7 +1392,7 @@ static int mmc_select_hs400es(struct mmc_card *card) err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING , val, card->ext_csd.generic_cmd6_time,0 , - false, true); + false, true, false);if (err) {pr_err ("%s: switch to hs400es failed, err:%d\n" ,mmc_hostname (host), err);
@@ -1457,7 +1457,7 @@ static int mmc_select_hs200(struct mmc_card *card) err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING , val, card->ext_csd.generic_cmd6_time,0 , - false, true); + false, true, false);if (err) goto err; old_timing = host->ios.timing;
@@ -1959,7 +1959,7 @@ static int mmc_poweroff_notify(struct mmc_card *card, unsigned int notify_type) err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_POWER_OFF_NOTIFICATION , - notify_type, timeout,0 , false, false); + notify_type, timeout,0 , false, false, false);if (err)pr_err ("%s: Power Off Notification timed out, %u\n" ,mmc_hostname (card->host), timeout);
drivers/mmc/core/mmc_ops.c +5 -2
@@ -552,12 +552,13 @@ int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,* @timing: new timing to change to * @send_status: send status cmd to poll for busy * @retry_crc_err: retry when CRC errors when polling with CMD13 for busy +* @no_crc_resp: do not require to check CRC response * * Modifies the EXT_CSD register for selected card. */ int __mmc_switch (struct mmc_card *card,u8 set,u8 index,u8 value,unsigned int timeout_ms,unsigned char timing, -bool send_status,bool retry_crc_err) +bool send_status,bool retry_crc_err,bool no_crc_resp) {struct mmc_host *host = card->host;int err;
@@ -594,6 +595,8 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, }else { cmd.flags |=MMC_RSP_SPI_R1 |MMC_RSP_R1 ; } +if (no_crc_resp) + cmd.flags &= ~MMC_RSP_CRC ;if (index ==EXT_CSD_SANITIZE_START ) cmd.sanitize_busy = true;
@@ -639,7 +642,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, unsigned int timeout_ms) {return __mmc_switch (card, set, index, value, timeout_ms,0 , - true, false); + true, false, false); }EXPORT_SYMBOL_GPL (mmc_switch);
drivers/mmc/core/mmc_ops.h +1 -1
@@ -40,7 +40,7 @@ int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, enum mmc_busy_cmd busy_cmd);int __mmc_switch (struct mmc_card *card,u8 set,u8 index,u8 value,unsigned int timeout_ms,unsigned char timing, -bool send_status,bool retry_crc_err); +bool send_status,bool retry_crc_err,bool no_crc_resp);int mmc_switch (struct mmc_card *card,u8 set,u8 index,u8 value,unsigned int timeout_ms);void mmc_run_bkops (struct mmc_card *card);
Signature · 1 line
2.17.1
RFC PATCH 3/3 mmc: core: Do not change frequency before switch from HS400
In reply to Adrian HunterDo not change frequency before switch from HS400 but in case of error try again after frequency change.
--- drivers/mmc/core/mmc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/mmc/core/mmc.c +13 -6
@@ -1235,20 +1235,27 @@ int mmc_hs400_to_hs200(struct mmc_card *card)int err;u8 val; -/* Reduce frequency to HS */ - max_dtr = card->ext_csd.hs_max_dtr; -mmc_set_clock (host, max_dtr); -/* Switch HS400 to HS DDR */ val =EXT_CSD_TIMING_HS ; err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL ,EXT_CSD_HS_TIMING , val, card->ext_csd.generic_cmd6_time,0 , false, true, true); -if (err) - goto out_err;mmc_set_timing (host,MMC_TIMING_MMC_DDR52 ); +/* Reduce frequency to HS */ + max_dtr = card->ext_csd.hs_max_dtr; +mmc_set_clock (host, max_dtr); + +if (err) { + err =__mmc_switch (card,EXT_CSD_CMD_SET_NORMAL , +EXT_CSD_HS_TIMING , val, + card->ext_csd.generic_cmd6_time,0 , false, + true, true); + } +if (err) + goto out_err; + err =mmc_switch_status (card, true);if (err) goto out_err;
Signature · 1 line
2.17.1