[patch v2 16/16] MMC: S3C24XX: Add media presence test to request handling.

Ben Dooks
2008-06-16T14:38:07Z

[-- Attachment #1: simtec/s3c24xx-sdmmc-add-mediacheck.patch --]
[-- Type: text/plain, Size: 2123 bytes --]

Ensure that we have physical media present before attempting to
send a request to a card. This ensures that we do not get flooded
by errors from commands that can never be completed timing out.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

Index: linux-2.6.26-rc5-q2/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.26-rc5-q2.orig/drivers/mmc/host/s3cmci.c 2008-06-16 15:25:12.000000000 +0100
+++ linux-2.6.26-rc5-q2/drivers/mmc/host/s3cmci.c 2008-06-16 15:25:13.000000000 +0100
@@ -985,6 +985,20 @@ static void s3cmci_send_request(struct m
enable_irq(host->irq);
}

+static int s3cmci_card_present(struct s3cmci_host *host)
+{
+ struct s3c24xx_mci_pdata *pdata = host->pdata;
+ int ret;
+
+ /* if we can't detect the presence, then always have card. */
+ if (pdata->gpio_detect == 0)
+ return 1;
+
+ ret = s3c2410_gpio_getpin(pdata->gpio_detect) ? 0 : 1;
+
+ return ret ^ pdata->detect_invert;
+}
+
static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
{
struct s3cmci_host *host = mmc_priv(mmc);
@@ -992,7 +1006,12 @@ static void s3cmci_request(struct mmc_ho
host->cmd_is_stop = 0;
host->mrq = mrq;

- s3cmci_send_request(mmc);
+ if (!s3cmci_card_present(host)) {
+ dbg(host, dbg_err, "%s: no medium present\n", __func__);
+ host->mrq->cmd->error = -ENOMEDIUM;
+ mmc_request_done(mmc, mrq);
+ } else
+ s3cmci_send_request(mmc);
}

static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
Index: linux-2.6.26-rc5-q2/include/asm-arm/arch-s3c2410/mci.h
===================================================================
--- linux-2.6.26-rc5-q2.orig/include/asm-arm/arch-s3c2410/mci.h 2008-06-16 15:25:01.000000000 +0100
+++ linux-2.6.26-rc5-q2/include/asm-arm/arch-s3c2410/mci.h 2008-06-16 15:25:13.000000000 +0100
@@ -3,6 +3,7 @@

struct s3c24xx_mci_pdata {
unsigned int wprotect_invert : 1;
+ unsigned int detect_invert : 1; /* set => detect active high. */

unsigned int gpio_detect;
unsigned int gpio_wprotect;