This will allow retrying access mode switch to High-Speed in the
following commit.
Signed-off-by: Yousong Zhou <yszhou4t...@gmail.com>
---
drivers/mmc/core/core.c | 4 ++++
drivers/mmc/core/sd_ops.c | 5 +++--
drivers/mmc/core/sd_ops.h | 10 ++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 9ad73f3..e726bb1 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -468,11 +468,13 @@ static void mmc_wait_for_req_done(struct mmc_host *host,
struct mmc_request *mrq)
{
struct mmc_command *cmd;
+ struct mmc_data *data;
while (1) {
wait_for_completion(&mrq->completion);
cmd = mrq->cmd;
+ data = mrq->data;
/*
* If host has timed out waiting for the sanitize
@@ -501,6 +503,8 @@ static void mmc_wait_for_req_done(struct mmc_host *host,
mmc_hostname(host), cmd->opcode, cmd->error);
cmd->retries--;
cmd->error = 0;
+ if (data)
+ data->error = 0;
__mmc_start_request(host, mrq);
}
diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c
index 48d0c93..22bef3c 100644
--- a/drivers/mmc/core/sd_ops.c
+++ b/drivers/mmc/core/sd_ops.c
@@ -304,8 +304,8 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
return 0;
}
-int mmc_sd_switch(struct mmc_card *card, int mode, int group,
- u8 value, u8 *resp)
+int __mmc_sd_switch(struct mmc_card *card, int mode, int group,
+ u8 value, u8 *resp, int retries)
{
struct mmc_request mrq = {NULL};
struct mmc_command cmd = {0};
@@ -328,6 +328,7 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int
group,
cmd.arg &= ~(0xF << (group * 4));
cmd.arg |= value << (group * 4);
cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
+ cmd.retries = retries;
data.blksz = 64;
data.blocks = 1;
diff --git a/drivers/mmc/core/sd_ops.h b/drivers/mmc/core/sd_ops.h
index ffc2305..a53c51e 100644
--- a/drivers/mmc/core/sd_ops.h
+++ b/drivers/mmc/core/sd_ops.h
@@ -17,9 +17,15 @@ int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32
*rocr);
int mmc_send_if_cond(struct mmc_host *host, u32 ocr);
int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca);
int mmc_app_send_scr(struct mmc_card *card, u32 *scr);
-int mmc_sd_switch(struct mmc_card *card, int mode, int group,
- u8 value, u8 *resp);
int mmc_app_sd_status(struct mmc_card *card, void *ssr);
+int __mmc_sd_switch(struct mmc_card *card, int mode, int group,
+ u8 value, u8 *resp, int retries);
+static inline int mmc_sd_switch(struct mmc_card *card, int mode, int group,
+ u8 value, u8 *resp)
+{
+ return __mmc_sd_switch(card, mode, group, value, resp, 0);
+}
+
#endif
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
