The patch titled
mmc: check only relevant inhibit bits
has been removed from the -mm tree. Its filename is
mmc-check-only-relevant-inhibit-bits.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: mmc: check only relevant inhibit bits
From: Pierre Ossman <drzeus@xxxxxxxxx>
Conform to the sdhci specification as to which inhibit bits should be checked
at different times.
Signed-off-by: Pierre Ossman <drzeus@xxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/mmc/sdhci.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff -puN drivers/mmc/sdhci.c~mmc-check-only-relevant-inhibit-bits drivers/mmc/sdhci.c
--- a/drivers/mmc/sdhci.c~mmc-check-only-relevant-inhibit-bits
+++ a/drivers/mmc/sdhci.c
@@ -465,6 +465,7 @@ static void sdhci_finish_data(struct sdh
static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
{
int flags;
+ u32 mask;
unsigned long timeout;
WARN_ON(host->cmd);
@@ -473,11 +474,20 @@ static void sdhci_send_command(struct sd
/* Wait max 10 ms */
timeout = 10;
- while (readl(host->ioaddr + SDHCI_PRESENT_STATE) &
- (SDHCI_CMD_INHIBIT | SDHCI_DATA_INHIBIT)) {
+
+ mask = SDHCI_CMD_INHIBIT;
+ if ((cmd->data != NULL) || (cmd->flags & MMC_RSP_BUSY))
+ mask |= SDHCI_DATA_INHIBIT;
+
+ /* We shouldn't wait for data inihibit for stop commands, even
+ though they might use busy signaling */
+ if (host->mrq->data && (cmd == host->mrq->data->stop))
+ mask &= ~SDHCI_DATA_INHIBIT;
+
+ while (readl(host->ioaddr + SDHCI_PRESENT_STATE) & mask) {
if (timeout == 0) {
printk(KERN_ERR "%s: Controller never released "
- "inhibit bits. Please report this to "
+ "inhibit bit(s). Please report this to "
BUGMAIL ".\n", mmc_hostname(host->mmc));
sdhci_dumpregs(host);
cmd->error = MMC_ERR_FAILED;
_
Patches currently in -mm which might be from drzeus@xxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
