Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  at91_mci: minor cleanup
  mmc: mmc host test driver
  mmc: Fix omap compile by replacing dev_name with dma_dev_name

5 files changed, 915 insertions, 7 deletions

diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig
index aa8a4e461942..dd0f398ee2f5 100644
--- a/drivers/mmc/card/Kconfig
+++ b/drivers/mmc/card/Kconfig
@@ -39,3 +39,15 @@ config SDIO_UART
           SDIO function driver for SDIO cards that implements the UART
           class, as well as the GPS class which appears like a UART.
 
+config MMC_TEST
+        tristate "MMC host test driver"
+        default n
+        help
+          Development driver that performs a series of reads and writes
+          to a memory card in order to expose certain well known bugs
+          in host controllers. The tests are executed by writing to the
+          "test" file in sysfs under each card. Note that whatever is
+          on your card will be overwritten by these tests.
+
+          This driver is only of interest to those developing or
+          testing a host driver. Most people should say N here.
diff --git a/drivers/mmc/card/Makefile b/drivers/mmc/card/Makefile
index fc5a784cfa1a..0d407514f67d 100644
--- a/drivers/mmc/card/Makefile
+++ b/drivers/mmc/card/Makefile
@@ -8,6 +8,7 @@ endif
 
 obj-$(CONFIG_MMC_BLOCK)         += mmc_block.o
 mmc_block-objs                  := block.o queue.o
+obj-$(CONFIG_MMC_TEST)          += mmc_test.o
 
 obj-$(CONFIG_SDIO_UART)         += sdio_uart.o
 
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
new file mode 100644
index 000000000000..ffadee549a41
--- /dev/null
+++ b/drivers/mmc/card/mmc_test.c
@@ -0,0 +1,892 @@
+/*
+ *  linux/drivers/mmc/card/mmc_test.c
+ *
+ *  Copyright 2007 Pierre Ossman
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#include <linux/mmc/core.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/mmc.h>
+
+#include <linux/scatterlist.h>
+
+#define RESULT_OK               0
+#define RESULT_FAIL             1
+#define RESULT_UNSUP_HOST       2
+#define RESULT_UNSUP_CARD       3
+
+#define BUFFER_SIZE     (PAGE_SIZE * 4)
+
+struct mmc_test_card {
+        struct mmc_card *card;
+
+        u8              *buffer;
+};
+
+/*******************************************************************/
+/*  Helper functions                                               */
+/*******************************************************************/
+
+static int mmc_test_set_blksize(struct mmc_test_card *test, unsigned size)
+{
+        struct mmc_command cmd;
+        int ret;
+
+        cmd.opcode = MMC_SET_BLOCKLEN;
+        cmd.arg = size;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+        ret = mmc_wait_for_cmd(test->card->host, &cmd, 0);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+static int __mmc_test_transfer(struct mmc_test_card *test, int write,
+        unsigned broken_xfer, u8 *buffer, unsigned addr,
+        unsigned blocks, unsigned blksz)
+{
+        int ret, busy;
+
+        struct mmc_request mrq;
+        struct mmc_command cmd;
+        struct mmc_command stop;
+        struct mmc_data data;
+
+        struct scatterlist sg;
+
+        memset(&mrq, 0, sizeof(struct mmc_request));
+
+        mrq.cmd = &cmd;
+        mrq.data = &data;
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        if (broken_xfer) {
+                if (blocks > 1) {
+                        cmd.opcode = write ?
+                                MMC_WRITE_BLOCK : MMC_READ_SINGLE_BLOCK;
+                } else {
+                        cmd.opcode = MMC_SEND_STATUS;
+                }
+        } else {
+                if (blocks > 1) {
+                        cmd.opcode = write ?
+                                MMC_WRITE_MULTIPLE_BLOCK : MMC_READ_MULTIPLE_BLOCK;
+                } else {
+                        cmd.opcode = write ?
+                                MMC_WRITE_BLOCK : MMC_READ_SINGLE_BLOCK;
+                }
+        }
+
+        if (broken_xfer && blocks == 1)
+                cmd.arg = test->card->rca << 16;
+        else
+                cmd.arg = addr;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+        memset(&stop, 0, sizeof(struct mmc_command));
+
+        if (!broken_xfer && (blocks > 1)) {
+                stop.opcode = MMC_STOP_TRANSMISSION;
+                stop.arg = 0;
+                stop.flags = MMC_RSP_R1B | MMC_CMD_AC;
+
+                mrq.stop = &stop;
+        }
+
+        memset(&data, 0, sizeof(struct mmc_data));
+
+        data.blksz = blksz;
+        data.blocks = blocks;
+        data.flags = write ? MMC_DATA_WRITE : MMC_DATA_READ;
+        data.sg = &sg;
+        data.sg_len = 1;
+
+        sg_init_one(&sg, buffer, blocks * blksz);
+
+        mmc_set_data_timeout(&data, test->card);
+
+        mmc_wait_for_req(test->card->host, &mrq);
+
+        ret = 0;
+
+        if (broken_xfer) {
+                if (!ret && cmd.error)
+                        ret = cmd.error;
+                if (!ret && data.error == 0)
+                        ret = RESULT_FAIL;
+                if (!ret && data.error != -ETIMEDOUT)
+                        ret = data.error;
+                if (!ret && stop.error)
+                        ret = stop.error;
+                if (blocks > 1) {
+                        if (!ret && data.bytes_xfered > blksz)
+                                ret = RESULT_FAIL;
+                } else {
+                        if (!ret && data.bytes_xfered > 0)
+                                ret = RESULT_FAIL;
+                }
+        } else {
+                if (!ret && cmd.error)
+                        ret = cmd.error;
+                if (!ret && data.error)
+                        ret = data.error;
+                if (!ret && stop.error)
+                        ret = stop.error;
+                if (!ret && data.bytes_xfered != blocks * blksz)
+                        ret = RESULT_FAIL;
+        }
+
+        if (ret == -EINVAL)
+                ret = RESULT_UNSUP_HOST;
+
+        busy = 0;
+        do {
+                int ret2;
+
+                memset(&cmd, 0, sizeof(struct mmc_command));
+
+                cmd.opcode = MMC_SEND_STATUS;
+                cmd.ar