mmc: set erase control register for SDHCI HC

PATCH Superseded Chuanxiao Dong 1 participant 1 message Nov 18, 2010

Subsystems (2)

MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver

lore

Share & tools

lore

Chuanxiao Dong

author

2010-11-18 09:03 UTC #0 lore raw

PATCH v2 2/3 mmc: set erase control register for SDHCI HC

Quoted 1 line

From 6ddad5c28d1f2d57081df051b79912dde922e322 Mon Sep 17 00:00:00 2001

From: Chuanxiao Dong <[email protected]>
Date: Thu, 18 Nov 2010 16:20:39 +0800
Subject: [PATCH 2/3] mmc: set erase control reg value for sdhci HC

For those sdhci host controller which cannot erase the unlimited sectors, set their timeout value to be the maximum one which is safe for erasing.

Signed-off-by Chuanxiao Dong <[email protected]>

---
 drivers/mmc/core/core.c  |    4 ++++
 drivers/mmc/host/sdhci.c |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

drivers/mmc/core/core.c +4 -0

index 947d963..0b77739 100644
@@ -170,6 +170,9 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
 
 	mrq->cmd->error = 0;
 	mrq->cmd->mrq = mrq;
+	if (mrq->cmd->opcode != MMC_ERASE)
+		mrq->cmd->erase_timeout = 0;
+
 	if (mrq->data) {
 		BUG_ON(mrq->data->blksz > host->max_blk_size);
 		BUG_ON(mrq->data->blocks > host->max_blk_count);

@@ -190,6 +193,7 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
 			mrq->data->stop = mrq->stop;
 			mrq->stop->error = 0;
 			mrq->stop->mrq = mrq;
+			mrq->stop->erase_timeout = 0;
 		}
 	}
 	mmc_host_clk_ungate(host);

drivers/mmc/host/sdhci.c +6 -0

index fa66988..a466635 100644
@@ -946,6 +946,12 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
 	if (cmd->data)
 		flags |= SDHCI_CMD_DATA;
 
+	if (host->quirks & SDHCI_QUIRK_FORCE_ERASE_SINGLE) {
+		/* Set the timeout to be the maximum value */
+		if (cmd->erase_timeout)
+			sdhci_writeb(host, 0xE, SDHCI_TIMEOUT_CONTROL);
+	}
+
 	sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND);
 }

Signature · 1 line

1.6.6.1