mmc: Move core functions to subdir
authorPierre Ossman <drzeus@drzeus.cx>
Wed, 28 Feb 2007 14:33:10 +0000 (15:33 +0100)
committerPierre Ossman <drzeus@drzeus.cx>
Tue, 1 May 2007 11:04:18 +0000 (13:04 +0200)
Create a "core" subdirectory to house the central bus handling
functions.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
12 files changed:
drivers/mmc/Makefile
drivers/mmc/core/Makefile [new file with mode: 0644]
drivers/mmc/core/core.c [new file with mode: 0644]
drivers/mmc/core/core.h [new file with mode: 0644]
drivers/mmc/core/sysfs.c [new file with mode: 0644]
drivers/mmc/mmc.c [deleted file]
drivers/mmc/mmc.h [deleted file]
drivers/mmc/mmc_sysfs.c [deleted file]
include/linux/mmc/card.h
include/linux/mmc/core.h [new file with mode: 0644]
include/linux/mmc/host.h
include/linux/mmc/mmc.h [deleted file]

index 4d2bdfeb8d7616b3528cedfcf4ff469ca66ba4fc..9979f5e9765bd8e317dbc19a822ffd154733a3d2 100644 (file)
@@ -6,12 +6,7 @@ ifeq ($(CONFIG_MMC_DEBUG),y)
        EXTRA_CFLAGS            += -DDEBUG
 endif
 
-#
-# Core
-#
-obj-$(CONFIG_MMC)              += mmc_core.o
-mmc_core-y                     := mmc.o mmc_sysfs.o
-
+obj-$(CONFIG_MMC)              += core/
 obj-$(CONFIG_MMC)              += card/
 obj-$(CONFIG_MMC)              += host/
 
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile
new file mode 100644 (file)
index 0000000..f911fbd
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Makefile for the kernel mmc core.
+#
+
+ifeq ($(CONFIG_MMC_DEBUG),y)
+       EXTRA_CFLAGS            += -DDEBUG
+endif
+
+obj-$(CONFIG_MMC)              += mmc_core.o
+mmc_core-y                     := core.o sysfs.o
+
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
new file mode 100644 (file)
index 0000000..334e663
--- /dev/null
@@ -0,0 +1,1638 @@
+/*
+ *  linux/drivers/mmc/core/core.c
+ *
+ *  Copyright (C) 2003-2004 Russell King, All Rights Reserved.
+ *  SD support Copyright (C) 2004 Ian Molton, All Rights Reserved.
+ *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
+ *  MMCv4 support Copyright (C) 2006 Philip Langdale, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/completion.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/pagemap.h>
+#include <linux/err.h>
+#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
+
+#include <linux/mmc/card.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/protocol.h>
+
+#include "core.h"
+
+#define CMD_RETRIES    3
+
+/*
+ * OCR Bit positions to 10s of Vdd mV.
+ */
+static const unsigned short mmc_ocr_bit_to_vdd[] = {
+       150,    155,    160,    165,    170,    180,    190,    200,
+       210,    220,    230,    240,    250,    260,    270,    280,
+       290,    300,    310,    320,    330,    340,    350,    360
+};
+
+static const unsigned int tran_exp[] = {
+       10000,          100000,         1000000,        10000000,
+       0,              0,              0,              0
+};
+
+static const unsigned char tran_mant[] = {
+       0,      10,     12,     13,     15,     20,     25,     30,
+       35,     40,     45,     50,     55,     60,     70,     80,
+};
+
+static const unsigned int tacc_exp[] = {
+       1,      10,     100,    1000,   10000,  100000, 1000000, 10000000,
+};
+
+static const unsigned int tacc_mant[] = {
+       0,      10,     12,     13,     15,     20,     25,     30,
+       35,     40,     45,     50,     55,     60,     70,     80,
+};
+
+
+/**
+ *     mmc_request_done - finish processing an MMC request
+ *     @host: MMC host which completed request
+ *     @mrq: MMC request which request
+ *
+ *     MMC drivers should call this function when they have completed
+ *     their processing of a request.
+ */
+void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
+{
+       struct mmc_command *cmd = mrq->cmd;
+       int err = cmd->error;
+
+       pr_debug("%s: req done (CMD%u): %d/%d/%d: %08x %08x %08x %08x\n",
+                mmc_hostname(host), cmd->opcode, err,
+                mrq->data ? mrq->data->error : 0,
+                mrq->stop ? mrq->stop->error : 0,
+                cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
+
+       if (err && cmd->retries) {
+               cmd->retries--;
+               cmd->error = 0;
+               host->ops->request(host, mrq);
+       } else if (mrq->done) {
+               mrq->done(mrq);
+       }
+}
+
+EXPORT_SYMBOL(mmc_request_done);
+
+/**
+ *     mmc_start_request - start a command on a host
+ *     @host: MMC host to start command on
+ *     @mrq: MMC request to start
+ *
+ *     Queue a command on the specified host.  We expect the
+ *     caller to be holding the host lock with interrupts disabled.
+ */
+void
+mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
+{
+#ifdef CONFIG_MMC_DEBUG
+       unsigned int i, sz;
+#endif
+
+       pr_debug("%s: starting CMD%u arg %08x flags %08x\n",
+                mmc_hostname(host), mrq->cmd->opcode,
+                mrq->cmd->arg, mrq->cmd->flags);
+
+       WARN_ON(!host->claimed);
+
+       mrq->cmd->error = 0;
+       mrq->cmd->mrq = mrq;
+       if (mrq->data) {
+               BUG_ON(mrq->data->blksz > host->max_blk_size);
+               BUG_ON(mrq->data->blocks > host->max_blk_count);
+               BUG_ON(mrq->data->blocks * mrq->data->blksz >
+                       host->max_req_size);
+
+#ifdef CONFIG_MMC_DEBUG
+               sz = 0;
+               for (i = 0;i < mrq->data->sg_len;i++)
+                       sz += mrq->data->sg[i].length;
+               BUG_ON(sz != mrq->data->blocks * mrq->data->blksz);
+#endif
+
+               mrq->cmd->data = mrq->data;
+               mrq->data->error = 0;
+               mrq->data->mrq = mrq;
+               if (mrq->stop) {
+                       mrq->data->stop = mrq->stop;
+                       mrq->stop->error = 0;
+                       mrq->stop->mrq = mrq;
+               }
+       }
+       host->ops->request(host, mrq);
+}
+
+EXPORT_SYMBOL(mmc_start_request);
+
+static void mmc_wait_done(struct mmc_request *mrq)
+{
+       complete(mrq->done_data);
+}
+
+int mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq)
+{
+       DECLARE_COMPLETION_ONSTACK(complete);
+
+       mrq->done_data = &complete;
+       mrq->done = mmc_wait_done;
+
+       mmc_start_request(host, mrq);
+
+       wait_for_completion(&complete);
+
+       return 0;
+}
+
+EXPORT_SYMBOL(mmc_wait_for_req);
+
+/**
+ *     mmc_wait_for_cmd - start a command and wait for completion
+ *     @host: MMC host to start command
+ *     @cmd: MMC command to start
+ *     @retries: maximum number of retries
+ *
+ *     Start a new MMC command for a host, and wait for the command
+ *     to complete.  Return any error that occurred while the command
+ *     was executing.  Do not attempt to parse the response.
+ */
+int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries)
+{
+       struct mmc_request mrq;
+
+       BUG_ON(!host->claimed);
+
+       memset(&mrq, 0, sizeof(struct mmc_request));
+
+       memset(cmd->resp, 0, sizeof(cmd->resp));
+       cmd->retries = retries;
+
+       mrq.cmd = cmd;
+       cmd->data = NULL;
+
+       mmc_wait_for_req(host, &mrq);
+
+       return cmd->error;
+}
+
+EXPORT_SYMBOL(mmc_wait_for_cmd);
+
+/**
+ *     mmc_wait_for_app_cmd - start an application command and wait for
+                              completion
+ *     @host: MMC host to start command
+ *     @rca: RCA to send MMC_APP_CMD to
+ *     @cmd: MMC command to start
+ *     @retries: maximum number of retries
+ *
+ *     Sends a MMC_APP_CMD, checks the card response, sends the command
+ *     in the parameter and waits for it to complete. Return any error
+ *     that occurred while the command was executing.  Do not attempt to
+ *     parse the response.
+ */
+int mmc_wait_for_app_cmd(struct mmc_host *host, unsigned int rca,
+       struct mmc_command *cmd, int retries)
+{
+       struct mmc_request mrq;
+       struct mmc_command appcmd;
+
+       int i, err;
+
+       BUG_ON(!host->claimed);
+       BUG_ON(retries < 0);
+
+       err = MMC_ERR_INVALID;
+
+       /*
+        * We have to resend MMC_APP_CMD for each attempt so
+        * we cannot use the retries field in mmc_command.
+        */
+       for (i = 0;i <= retries;i++) {
+               memset(&mrq, 0, sizeof(struct mmc_request));
+
+               appcmd.opcode = MMC_APP_CMD;
+               appcmd.arg = rca << 16;
+               appcmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+               appcmd.retries = 0;
+               memset(appcmd.resp, 0, sizeof(appcmd.resp));
+               appcmd.data = NULL;
+
+               mrq.cmd = &appcmd;
+               appcmd.data = NULL;
+
+               mmc_wait_for_req(host, &mrq);
+
+               if (appcmd.error) {
+                       err = appcmd.error;
+                       continue;
+               }
+
+               /* Check that card supported application commands */
+               if (!(appcmd.resp[0] & R1_APP_CMD))
+                       return MMC_ERR_FAILED;
+
+               memset(&mrq, 0, sizeof(struct mmc_request));
+
+               memset(cmd->resp, 0, sizeof(cmd->resp));
+               cmd->retries = 0;
+
+               mrq.cmd = cmd;
+               cmd->data = NULL;
+
+               mmc_wait_for_req(host, &mrq);
+
+               err = cmd->error;
+               if (cmd->error == MMC_ERR_NONE)
+                       break;
+       }
+
+       return err;
+}
+
+EXPORT_SYMBOL(mmc_wait_for_app_cmd);
+
+/**
+ *     mmc_set_data_timeout - set the timeout for a data command
+ *     @data: data phase for command
+ *     @card: the MMC card associated with the data transfer
+ *     @write: flag to differentiate reads from writes
+ */
+void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card,
+                         int write)
+{
+       unsigned int mult;
+
+       /*
+        * SD cards use a 100 multiplier rather than 10
+        */
+       mult = mmc_card_sd(card) ? 100 : 10;
+
+       /*
+        * Scale up the multiplier (and therefore the timeout) by
+        * the r2w factor for writes.
+        */
+       if (write)
+               mult <<= card->csd.r2w_factor;
+
+       data->timeout_ns = card->csd.tacc_ns * mult;
+       data->timeout_clks = card->csd.tacc_clks * mult;
+
+       /*
+        * SD cards also have an upper limit on the timeout.
+        */
+       if (mmc_card_sd(card)) {
+               unsigned int timeout_us, limit_us;
+
+               timeout_us = data->timeout_ns / 1000;
+               timeout_us += data->timeout_clks * 1000 /
+                       (card->host->ios.clock / 1000);
+
+               if (write)
+                       limit_us = 250000;
+               else
+                       limit_us = 100000;
+
+               /*
+                * SDHC cards always use these fixed values.
+                */
+               if (timeout_us > limit_us || mmc_card_blockaddr(card)) {
+                       data->timeout_ns = limit_us * 1000;
+                       data->timeout_clks = 0;
+               }
+       }
+}
+EXPORT_SYMBOL(mmc_set_data_timeout);
+
+/**
+ *     __mmc_claim_host - exclusively claim a host
+ *     @host: mmc host to claim
+ *     @card: mmc card to claim host for
+ *
+ *     Claim a host for a set of operations.  If a valid card
+ *     is passed and this wasn't the last card selected, select
+ *     the card before returning.
+ *
+ *     Note: you should use mmc_card_claim_host or mmc_claim_host.
+ */
+void mmc_claim_host(struct mmc_host *host)
+{
+       DECLARE_WAITQUEUE(wait, current);
+       unsigned long flags;
+
+       add_wait_queue(&host->wq, &wait);
+       spin_lock_irqsave(&host->lock, flags);
+       while (1) {
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               if (!host->claimed)
+                       break;
+               spin_unlock_irqrestore(&host->lock, flags);
+               schedule();
+               spin_lock_irqsave(&host->lock, flags);
+       }
+       set_current_state(TASK_RUNNING);
+       host->claimed = 1;
+       spin_unlock_irqrestore(&host->lock, flags);
+       remove_wait_queue(&host->wq, &wait);
+}
+
+EXPORT_SYMBOL(mmc_claim_host);
+
+/**
+ *     mmc_release_host - release a host
+ *     @host: mmc host to release
+ *
+ *     Release a MMC host, allowing others to claim the host
+ *     for their operations.
+ */
+void mmc_release_host(struct mmc_host *host)
+{
+       unsigned long flags;
+
+       BUG_ON(!host->claimed);
+
+       spin_lock_irqsave(&host->lock, flags);
+       host->claimed = 0;
+       spin_unlock_irqrestore(&host->lock, flags);
+
+       wake_up(&host->wq);
+}
+
+EXPORT_SYMBOL(mmc_release_host);
+
+static inline void mmc_set_ios(struct mmc_host *host)
+{
+       struct mmc_ios *ios = &host->ios;
+
+       pr_debug("%s: clock %uHz busmode %u powermode %u cs %u Vdd %u "
+               "width %u timing %u\n",
+                mmc_hostname(host), ios->clock, ios->bus_mode,
+                ios->power_mode, ios->chip_select, ios->vdd,
+                ios->bus_width, ios->timing);
+
+       host->ops->set_ios(host, ios);
+}
+
+static int mmc_select_card(struct mmc_card *card)
+{
+       int err;
+       struct mmc_command cmd;
+
+       BUG_ON(!card->host->claimed);
+
+       cmd.opcode = MMC_SELECT_CARD;
+       cmd.arg = card->rca << 16;
+       cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+
+       err = mmc_wait_for_cmd(card->host, &cmd, CMD_RETRIES);
+       if (err != MMC_ERR_NONE)
+               return err;
+
+       /*
+        * We can only change the bus width of SD cards when
+        * they are selected so we have to put the handling
+        * here.
+        *
+        * The card is in 1 bit mode by default so
+        * we only need to change if it supports the
+        * wider version.
+        */
+       if (mmc_card_sd(card) &&
+               (card->scr.bus_widths & SD_SCR_BUS_WIDTH_4) &&
+               (card->host->caps & MMC_CAP_4_BIT_DATA)) {
+
+               struct mmc_command cmd;
+               cmd.opcode = SD_APP_SET_BUS_WIDTH;
+               cmd.arg = SD_BUS_WIDTH_4;
+               cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+
+               err = mmc_wait_for_app_cmd(card->host, card->rca,
+                       &cmd, CMD_RETRIES);
+               if (err != MMC_ERR_NONE)
+                       return err;
+
+               card->host->ios.bus_width = MMC_BUS_WIDTH_4;
+               mmc_set_ios(card->host);
+       }
+
+       return MMC_ERR_NONE;
+}
+
+
+static inline void mmc_delay(unsigned int ms)
+{
+       if (ms < 1000 / HZ) {
+               cond_resched();
+               mdelay(ms);
+       } else {
+               msleep(ms);
+       }
+}
+
+/*
+ * Mask off any voltages we don't support and select
+ * the lowest voltage
+ */
+static u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
+{
+       int bit;
+
+       ocr &= host->ocr_avail;
+
+       bit = ffs(ocr);
+       if (bit) {
+               bit -= 1;
+
+               ocr &= 3 << bit;
+
+               host->ios.vdd = bit;
+               mmc_set_ios(host);
+       } else {
+               ocr = 0;
+       }
+
+       return ocr;
+}
+
+#define UNSTUFF_BITS(resp,start,size)                                  \
+       ({                                                              \
+               const int __size = size;                                \
+               const u32 __mask = (__size < 32 ? 1 << __size : 0) - 1; \
+               const int __off = 3 - ((start) / 32);                   \
+               const int __shft = (start) & 31;                        \
+               u32 __res;                                              \
+                                                                       \
+               __res = resp[__off] >> __shft;                          \
+               if (__size + __shft > 32)                               \
+                       __res |= resp[__off-1] << ((32 - __shft) % 32); \
+               __res & __mask;                                         \
+       })
+
+/*
+ * Given the decoded CSD structure, decode the raw CID to our CID structure.
+ */
+static void mmc_decode_cid(struct mmc_card *card)
+{
+       u32 *resp = card->raw_cid;
+
+       memset(&card->cid, 0, sizeof(struct mmc_cid));
+
+       if (mmc_card_sd(card)) {
+               /*
+                * SD doesn't currently have a version field so we will
+                * have to assume we can parse this.
+                */
+               card->cid.manfid                = UNSTUFF_BITS(resp, 120, 8);
+               card->cid.oemid                 = UNSTUFF_BITS(resp, 104, 16);
+               card->cid.prod_name[0]          = UNSTUFF_BITS(resp, 96, 8);
+               card->cid.prod_name[1]          = UNSTUFF_BITS(resp, 88, 8);
+               card->cid.prod_name[2]          = UNSTUFF_BITS(resp, 80, 8);
+               card->cid.prod_name[3]          = UNSTUFF_BITS(resp, 72, 8);
+               card->cid.prod_name[4]          = UNSTUFF_BITS(resp, 64, 8);
+               card->cid.hwrev                 = UNSTUFF_BITS(resp, 60, 4);
+               card->cid.fwrev                 = UNSTUFF_BITS(resp, 56, 4);
+               card->cid.serial                = UNSTUFF_BITS(resp, 24, 32);
+               card->cid.year                  = UNSTUFF_BITS(resp, 12, 8);
+               card->cid.month                 = UNSTUFF_BITS(resp, 8, 4);
+
+               card->cid.year += 2000; /* SD cards year offset */
+       } else {
+               /*
+                * The selection of the format here is based upon published
+                * specs from sandisk and from what people have reported.
+                */
+               switch (card->csd.mmca_vsn) {
+               case 0: /* MMC v1.0 - v1.2 */
+               case 1: /* MMC v1.4 */
+                       card->cid.manfid        = UNSTUFF_BITS(resp, 104, 24);
+                       card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
+                       card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
+                       card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
+                       card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
+                       card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
+                       card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
+                       card->cid.prod_name[6]  = UNSTUFF_BITS(resp, 48, 8);
+                       card->cid.hwrev         = UNSTUFF_BITS(resp, 44, 4);
+                       card->cid.fwrev         = UNSTUFF_BITS(resp, 40, 4);
+                       card->cid.serial        = UNSTUFF_BITS(resp, 16, 24);
+                       card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
+                       card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
+                       break;
+
+               case 2: /* MMC v2.0 - v2.2 */
+               case 3: /* MMC v3.1 - v3.3 */
+               case 4: /* MMC v4 */
+                       card->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
+                       card->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
+                       card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
+                       card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
+                       card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
+                       card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
+                       card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
+                       card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
+                       card->cid.serial        = UNSTUFF_BITS(resp, 16, 32);
+                       card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
+                       card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
+                       break;
+
+               default:
+                       printk("%s: card has unknown MMCA version %d\n",
+                               mmc_hostname(card->host), card->csd.mmca_vsn);
+                       mmc_card_set_bad(card);
+                       break;
+               }
+       }
+}
+
+/*
+ * Given a 128-bit response, decode to our card CSD structure.
+ */
+static void mmc_decode_csd(struct mmc_card *card)
+{
+       struct mmc_csd *csd = &card->csd;
+       unsigned int e, m, csd_struct;
+       u32 *resp = card->raw_csd;
+
+       if (mmc_card_sd(card)) {
+               csd_struct = UNSTUFF_BITS(resp, 126, 2);
+
+               switch (csd_struct) {
+               case 0:
+                       m = UNSTUFF_BITS(resp, 115, 4);
+                       e = UNSTUFF_BITS(resp, 112, 3);
+                       csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+                       csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+                       m = UNSTUFF_BITS(resp, 99, 4);
+                       e = UNSTUFF_BITS(resp, 96, 3);
+                       csd->max_dtr      = tran_exp[e] * tran_mant[m];
+                       csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+                       e = UNSTUFF_BITS(resp, 47, 3);
+                       m = UNSTUFF_BITS(resp, 62, 12);
+                       csd->capacity     = (1 + m) << (e + 2);
+
+                       csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+                       csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
+                       csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
+                       csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+                       csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
+                       csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
+                       csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
+                       break;
+               case 1:
+                       /*
+                        * This is a block-addressed SDHC card. Most
+                        * interesting fields are unused and have fixed
+                        * values. To avoid getting tripped by buggy cards,
+                        * we assume those fixed values ourselves.
+                        */
+                       mmc_card_set_blockaddr(card);
+
+                       csd->tacc_ns     = 0; /* Unused */
+                       csd->tacc_clks   = 0; /* Unused */
+
+                       m = UNSTUFF_BITS(resp, 99, 4);
+                       e = UNSTUFF_BITS(resp, 96, 3);
+                       csd->max_dtr      = tran_exp[e] * tran_mant[m];
+                       csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+                       m = UNSTUFF_BITS(resp, 48, 22);
+                       csd->capacity     = (1 + m) << 10;
+
+                       csd->read_blkbits = 9;
+                       csd->read_partial = 0;
+                       csd->write_misalign = 0;
+                       csd->read_misalign = 0;
+                       csd->r2w_factor = 4; /* Unused */
+                       csd->write_blkbits = 9;
+                       csd->write_partial = 0;
+                       break;
+               default:
+                       printk("%s: unrecognised CSD structure version %d\n",
+                               mmc_hostname(card->host), csd_struct);
+                       mmc_card_set_bad(card);
+                       return;
+               }
+       } else {
+               /*
+                * We only understand CSD structure v1.1 and v1.2.
+                * v1.2 has extra information in bits 15, 11 and 10.
+                */
+               csd_struct = UNSTUFF_BITS(resp, 126, 2);
+               if (csd_struct != 1 && csd_struct != 2) {
+                       printk("%s: unrecognised CSD structure version %d\n",
+                               mmc_hostname(card->host), csd_struct);
+                       mmc_card_set_bad(card);
+                       return;
+               }
+
+               csd->mmca_vsn    = UNSTUFF_BITS(resp, 122, 4);
+               m = UNSTUFF_BITS(resp, 115, 4);
+               e = UNSTUFF_BITS(resp, 112, 3);
+               csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+               csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+               m = UNSTUFF_BITS(resp, 99, 4);
+               e = UNSTUFF_BITS(resp, 96, 3);
+               csd->max_dtr      = tran_exp[e] * tran_mant[m];
+               csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+               e = UNSTUFF_BITS(resp, 47, 3);
+               m = UNSTUFF_BITS(resp, 62, 12);
+               csd->capacity     = (1 + m) << (e + 2);
+
+               csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+               csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
+               csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
+               csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+               csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
+               csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
+               csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
+       }
+}
+
+/*
+ * Given a 64-bit response, decode to our card SCR structure.
+ */
+static void mmc_decode_scr(struct mmc_card *card)
+{
+       struct sd_scr *scr = &card->scr;
+       unsigned int scr_struct;
+       u32 resp[4];
+
+       BUG_ON(!mmc_card_sd(card));
+
+       resp[3] = card->raw_scr[1];
+       resp[2] = card->raw_scr[0];
+
+       scr_struct = UNSTUFF_BITS(resp, 60, 4);
+       if (scr_struct != 0) {
+               printk("%s: unrecognised SCR structure version %d\n",
+                       mmc_hostname(card->host), scr_struct);
+               mmc_card_set_bad(card);
+               return;
+       }
+
+       scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
+       scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
+}
+
+/*
+ * Allocate a new MMC card
+ */
+static struct mmc_card *
+mmc_alloc_card(struct mmc_host *host, u32 *raw_cid)
+{
+       struct mmc_card *card;
+
+       card = kmalloc(sizeof(struct mmc_card), GFP_KERNEL);
+       if (!card)
+               return ERR_PTR(-ENOMEM);
+
+       mmc_init_card(card, host);
+       memcpy(card->raw_cid, raw_cid, sizeof(card->raw_cid));
+
+       return card;
+}
+
+/*
+ * Tell attached cards to go to IDLE state
+ */
+static void mmc_idle_cards(struct mmc_host *host)
+{
+       struct mmc_command cmd;
+
+       host->ios.chip_select = MMC_CS_HIGH;
+       mmc_set_ios(host);
+
+       mmc_delay(1);
+
+       cmd.opcode = MMC_GO_IDLE_STATE;
+       cmd.arg = 0;
+       cmd.flags = MMC_RSP_NONE | MMC_CMD_BC;
+
+       mmc_wait_for_cmd(host, &cmd, 0);
+
+       mmc_delay(1);
+
+       host->ios.chip_select = MMC_CS_DONTCARE;
+       mmc_set_ios(host);
+
+       mmc_delay(1);
+}
+
+/*
+ * Apply power to the MMC stack.  This is a two-stage process.
+ * First, we enable power to the card without the clock running.
+ * We then wait a bit for the power to stabilise.  Finally,
+ * enable the bus drivers and clock to the card.
+ *
+ * We must _NOT_ enable the clock prior to power stablising.
+ *
+ * If a host does all the power sequencing itself, ignore the
+ * initial MMC_POWER_UP stage.
+ */
+static void mmc_power_up(struct mmc_host *host)
+{
+       int bit = fls(host->ocr_avail) - 1;
+
+       host->ios.vdd = bit;
+       host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+       host->ios.chip_select = MMC_CS_DONTCARE;
+       host->ios.power_mode = MMC_POWER_UP;
+       host->ios.bus_width = MMC_BUS_WIDTH_1;
+       host->ios.timing = MMC_TIMING_LEGACY;
+       mmc_set_ios(host);
+
+       mmc_delay(1);
+
+       host->ios.clock = host->f_min;
+       host->ios.power_mode = MMC_POWER_ON;
+       mmc_set_ios(host);
+
+       mmc_delay(2);
+}
+
+static void mmc_power_off(struct mmc_host *host)
+{
+       host->ios.clock = 0;
+       host->ios.vdd = 0;
+       host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+       host->ios.chip_select = MMC_CS_DONTCARE;
+       host->ios.power_mode = MMC_POWER_OFF;
+       host->ios.bus_width = MMC_BUS_WIDTH_1;
+       host->ios.timing = MMC_TIMING_LEGACY;
+       mmc_set_ios(host);
+}
+
+static int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
+{
+       struct mmc_command cmd;
+       int i, err = 0;
+
+       cmd.opcode = MMC_SEND_OP_COND;
+       cmd.arg = ocr;
+       cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
+
+       for (i = 100; i; i--) {
+               err = mmc_wait_for_cmd(host, &cmd, 0);
+               if (err != MMC_ERR_NONE)
+                       break;
+
+               if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                       break;
+
+               err = MMC_ERR_TIMEOUT;
+
+               mmc_delay(10);
+       }
+
+       if (rocr)
+               *rocr = cmd.resp[0];
+
+       return err;
+}
+
+static int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
+{
+       struct mmc_command cmd;
+       int i, err = 0;
+
+       cmd.opcode = SD_APP_OP_COND;
+       cmd.arg = ocr;
+       cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
+
+       for (i = 100; i; i--) {
+               err = mmc_wait_for_app_cmd(host, 0, &cmd, CMD_RETRIES);
+               if (err != MMC_ERR_NONE)
+                       break;
+
+               if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                       break;
+
+               err = MMC_ERR_TIMEOUT;
+
+               mmc_delay(10);
+       }
+
+       if (rocr)
+               *rocr = cmd.resp[0];
+
+       return err;
+}
+
+static int mmc_send_if_cond(struct mmc_host *host, u32 ocr, int *rsd2)
+{
+       struct mmc_command cmd;
+       int err, sd2;
+       static const u8 test_pattern = 0xAA;
+
+       /*
+       * To support SD 2.0 cards, we must always invoke SD_SEND_IF_COND
+       * before SD_APP_OP_COND. This command will harmlessly fail for
+       * SD 1.0 cards.
+       */
+       cmd.opcode = SD_SEND_IF_COND;
+       cmd.arg = ((ocr & 0xFF8000) != 0) << 8 | test_pattern;
+       cmd.flags = MMC_RSP_R7 | MMC_CMD_BCR;
+
+       err = mmc_wait_for_cmd(host, &cmd, 0);
+       if (err == MMC_ERR_NONE) {
+               if ((cmd.resp[0] & 0xFF) == test_pattern) {
+                       sd2 = 1;
+               } else {
+                       sd2 = 0;
+                       err = MMC_ERR_FAILED;
+               }
+       } else {
+               /*
+                * Treat errors as SD 1.0 card.
+                */
+               sd2 = 0;
+               err = MMC_ERR_NONE;
+       }
+       if (rsd2)
+               *rsd2 = sd2;
+       return err;
+}
+
+/*
+ * Discover the card by requesting its CID.
+ *
+ * Create a mmc_card entry for the discovered card, assigning
+ * it an RCA, and save the raw CID for decoding later.
+ */
+static void mmc_discover_card(struct mmc_host *host)
+{
+       unsigned int err;
+
+       struct mmc_command cmd;
+
+       BUG_ON(host->card);
+
+       cmd.opcode = MMC_ALL_SEND_CID;
+       cmd.arg = 0;
+       cmd.flags = MMC_RSP_R2 | MMC_CMD_BCR;
+
+       err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+       if (err == MMC_ERR_TIMEOUT) {
+               err = MMC_ERR_NONE;
+               return;
+       }
+       if (err != MMC_ERR_NONE) {
+               printk(KERN_ERR "%s: error requesting CID: %d\n",
+                       mmc_hostname(host), err);
+               return;
+       }
+
+       host->card = mmc_alloc_card(host, cmd.resp);
+       if (IS_ERR(host->card)) {
+               err = PTR_ERR(host->card);
+               host->card = NULL;
+               return;
+       }
+
+       if (host->mode == MMC_MODE_SD) {
+               host->card->type = MMC_TYPE_SD;
+
+               cmd.opcode = SD_SEND_RELATIVE_ADDR;
+               cmd.arg = 0;
+               cmd.flags = MMC_RSP_R6 | MMC_CMD_BCR;
+
+               err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+               if (err != MMC_ERR_NONE)
+                       mmc_card_set_dead(host->card);
+               else {
+                       host->card->rca = cmd.resp[0] >> 16;
+
+                       if (!host->ops->get_ro) {
+                               printk(KERN_WARNING "%s: host does not "
+                                       "support reading read-only "
+                                       "switch. assuming write-enable.\n",
+                                       mmc_hostname(host));
+                       } else {
+                               if (host->ops->get_ro(host))
+                                       mmc_card_set_readonly(host->card);
+                       }
+               }
+       } else {
+               host->card->type = MMC_TYPE_MMC;
+               host->card->rca = 1;
+
+               cmd.opcode = MMC_SET_RELATIVE_ADDR;
+               cmd.arg = host->card->rca << 16;
+               cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+
+               err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+               if (err != MMC_ERR_NONE)
+                       mmc_card_set_dead(host->card);
+       }
+}
+
+static void mmc_read_csd(struct mmc_host *host)
+{
+       struct mmc_command cmd;
+       int err;
+
+       if (!host->card)
+               return;
+       if (mmc_card_dead(host->card))
+               return;
+
+       cmd.opcode = MMC_SEND_CSD;
+       cmd.arg = host->card->rca << 16;
+       cmd.flags = MMC_RSP_R2 | MMC_CMD_AC;
+
+       err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+       if (err != MMC_ERR_NONE) {
+               mmc_card_set_dead(host->card);
+               return;
+       }
+
+       memcpy(host->card->raw_csd, cmd.resp, sizeof(host->card->raw_csd));
+
+       mmc_decode_csd(host->card);
+       mmc_decode_cid(host->card);
+}
+
+static void mmc_process_ext_csd(struct mmc_host *host)
+{
+       int err;
+
+       struct mmc_request mrq;
+       struct mmc_command cmd;
+       struct mmc_data data;
+
+       u8 *ext_csd;
+       struct scatterlist sg;
+
+       if (!host->card)
+               return;
+       if (mmc_card_dead(host->card))
+               return;
+       if (mmc_card_sd(host->card))
+               return;
+       if (host->card->csd.mmca_vsn < CSD_SPEC_VER_4)
+               return;
+
+       /*
+        * As the ext_csd is so large and mostly unused, we don't store the
+        * raw block in mmc_card.
+        */
+       ext_csd = kmalloc(512, GFP_KERNEL);
+       if (!ext_csd) {
+               printk("%s: could not allocate a buffer to receive the ext_csd."
+                      "mmc v4 cards will be treated as v3.\n",
+                       mmc_hostname(host));
+               return;
+       }
+
+       memset(&cmd, 0, sizeof(struct mmc_command));
+
+       cmd.opcode = MMC_SEND_EXT_CSD;
+       cmd.arg = 0;
+       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+       memset(&data, 0, sizeof(struct mmc_data));
+
+       mmc_set_data_timeout(&data, host->card, 0);
+
+       data.blksz = 512;
+       data.blocks = 1;
+       data.flags = MMC_DATA_READ;
+       data.sg = &sg;
+       data.sg_len = 1;
+
+       memset(&mrq, 0, sizeof(struct mmc_request));
+
+       mrq.cmd = &cmd;
+       mrq.data = &data;
+
+       sg_init_one(&sg, ext_csd, 512);
+
+       mmc_wait_for_req(host, &mrq);
+
+       if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
+               if (host->card->csd.capacity == (4096 * 512)) {
+                       printk(KERN_ERR "%s: unable to read EXT_CSD "
+                               "on a possible high capacity card. "
+                               "Card will be ignored.\n",
+                               mmc_hostname(host));
+                       mmc_card_set_dead(host->card);
+               } else {
+                       printk(KERN_WARNING "%s: unable to read "
+                               "EXT_CSD, performance might "
+                               "suffer.\n",
+                               mmc_hostname(host));
+               }
+               goto out;
+       }
+
+       host->card->ext_csd.sectors =
+               ext_csd[EXT_CSD_SEC_CNT + 0] << 0 |
+               ext_csd[EXT_CSD_SEC_CNT + 1] << 8 |
+               ext_csd[EXT_CSD_SEC_CNT + 2] << 16 |
+               ext_csd[EXT_CSD_SEC_CNT + 3] << 24;
+       if (host->card->ext_csd.sectors)
+               mmc_card_set_blockaddr(host->card);
+
+       switch (ext_csd[EXT_CSD_CARD_TYPE]) {
+       case EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
+               host->card->ext_csd.hs_max_dtr = 52000000;
+               break;
+       case EXT_CSD_CARD_TYPE_26:
+               host->card->ext_csd.hs_max_dtr = 26000000;
+               break;
+       default:
+               /* MMC v4 spec says this cannot happen */
+               printk("%s: card is mmc v4 but doesn't support "
+                      "any high-speed modes.\n",
+                       mmc_hostname(host));
+               goto out;
+       }
+
+       if (host->caps & MMC_CAP_MMC_HIGHSPEED) {
+               /* Activate highspeed support. */
+               cmd.opcode = MMC_SWITCH;
+               cmd.arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
+                         (EXT_CSD_HS_TIMING << 16) |
+                         (1 << 8) |
+                         EXT_CSD_CMD_SET_NORMAL;
+               cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+
+               err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+               if (err != MMC_ERR_NONE) {
+                       printk("%s: failed to switch card to mmc v4 "
+                              "high-speed mode.\n",
+                              mmc_hostname(host));
+                       goto out;
+               }
+
+               mmc_card_set_highspeed(host->card);
+
+               host->ios.timing = MMC_TIMING_MMC_HS;
+               mmc_set_ios(host);
+       }
+
+       /* Check for host support for wide-bus modes. */
+       if (host->caps & MMC_CAP_4_BIT_DATA) {
+               /* Activate 4-bit support. */
+               cmd.opcode = MMC_SWITCH;
+               cmd.arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
+                         (EXT_CSD_BUS_WIDTH << 16) |
+                         (EXT_CSD_BUS_WIDTH_4 << 8) |
+                         EXT_CSD_CMD_SET_NORMAL;
+               cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+
+               err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+               if (err != MMC_ERR_NONE) {
+                       printk("%s: failed to switch card to "
+                              "mmc v4 4-bit bus mode.\n",
+                              mmc_hostname(host));
+                       goto out;
+               }
+
+               host->ios.bus_width = MMC_BUS_WIDTH_4;
+               mmc_set_ios(host);
+       }
+
+out:
+       kfree(ext_csd);
+}
+
+static void mmc_read_scr(struct mmc_host *host)
+{
+       int err;
+       struct mmc_request mrq;
+       struct mmc_command cmd;
+       struct mmc_data data;
+       struct scatterlist sg;
+
+       if (!host->card)
+               return;
+       if (mmc_card_dead(host->card))
+               return;
+       if (!mmc_card_sd(host->card))
+               return;
+
+       memset(&cmd, 0, sizeof(struct mmc_command));
+
+       cmd.opcode = MMC_APP_CMD;
+       cmd.arg = host->card->rca << 16;
+       cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+
+       err = mmc_wait_for_cmd(host, &cmd, 0);
+       if ((err != MMC_ERR_NONE) || !(cmd.resp[0] & R1_APP_CMD)) {
+               mmc_card_set_dead(host->card);
+               return;
+       }
+
+       memset(&cmd, 0, sizeof(struct mmc_command));
+
+       cmd.opcode = SD_APP_SEND_SCR;
+       cmd.arg = 0;
+       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+       memset(&data, 0, sizeof(struct mmc_data));
+
+       mmc_set_data_timeout(&data, host->card, 0);
+
+       data.blksz = 1 << 3;
+       data.blocks = 1;
+       data.flags = MMC_DATA_READ;
+       data.sg = &sg;
+       data.sg_len = 1;
+
+       memset(&mrq, 0, sizeof(struct mmc_request));
+
+       mrq.cmd = &cmd;
+       mrq.data = &data;
+
+       sg_init_one(&sg, (u8*)host->card->raw_scr, 8);
+
+       mmc_wait_for_req(host, &mrq);
+
+       if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
+               mmc_card_set_dead(host->card);
+               return;
+       }
+
+       host->card->raw_scr[0] = ntohl(host->card->raw_scr[0]);
+       host->card->raw_scr[1] = ntohl(host->card->raw_scr[1]);
+
+       mmc_decode_scr(host->card);
+}
+
+static void mmc_read_switch_caps(struct mmc_host *host)
+{
+       struct mmc_request mrq;
+       struct mmc_command cmd;
+       struct mmc_data data;
+       unsigned char *status;
+       struct scatterlist sg;
+
+       if (!(host->caps & MMC_CAP_SD_HIGHSPEED))
+               return;
+
+       if (!host->card)
+               return;
+       if (mmc_card_dead(host->card))
+               return;
+       if (!mmc_card_sd(host->card))
+               return;
+       if (host->card->scr.sda_vsn < SCR_SPEC_VER_1)
+               return;
+
+       status = kmalloc(64, GFP_KERNEL);
+       if (!status) {
+               printk(KERN_WARNING "%s: Unable to allocate buffer for "
+                       "reading switch capabilities.\n",
+                       mmc_hostname(host));
+               return;
+       }
+
+       memset(&cmd, 0, sizeof(struct mmc_command));
+
+       cmd.opcode = SD_SWITCH;
+       cmd.arg = 0x00FFFFF1;
+       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+       memset(&data, 0, sizeof(struct mmc_data));
+
+       mmc_set_data_timeout(&data, host->card, 0);
+
+       data.blksz = 64;
+       data.blocks = 1;
+       data.flags = MMC_DATA_READ;
+       data.sg = &sg;
+       data.sg_len = 1;
+
+       memset(&mrq, 0, sizeof(struct mmc_request));
+
+       mrq.cmd = &cmd;
+       mrq.data = &data;
+
+       sg_init_one(&sg, status, 64);
+
+       mmc_wait_for_req(host, &mrq);
+
+       if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
+               printk("%s: unable to read switch capabilities, "
+                       "performance might suffer.\n",
+                       mmc_hostname(host));
+               goto out;
+       }
+
+       if (status[13] & 0x02)
+               host->card->sw_caps.hs_max_dtr = 50000000;
+
+       memset(&cmd, 0, sizeof(struct mmc_command));
+
+       cmd.opcode = SD_SWITCH;
+       cmd.arg = 0x80FFFFF1;
+       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+       memset(&data, 0, sizeof(struct mmc_data));
+
+       mmc_set_data_timeout(&data, host->card, 0);
+
+       data.blksz = 64;
+       data.blocks = 1;
+       data.flags = MMC_DATA_READ;
+       data.sg = &sg;
+       data.sg_len = 1;
+
+       memset(&mrq, 0, sizeof(struct mmc_request));
+
+       mrq.cmd = &cmd;
+       mrq.data = &data;
+
+       sg_init_one(&sg, status, 64);
+
+       mmc_wait_for_req(host, &mrq);
+
+       if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE ||
+               (status[16] & 0xF) != 1) {
+               printk(KERN_WARNING "%s: Problem switching card "
+                       "into high-speed mode!\n",
+                       mmc_hostname(host));
+               goto out;
+       }
+
+       mmc_card_set_highspeed(host->card);
+
+       host->ios.timing = MMC_TIMING_SD_HS;
+       mmc_set_ios(host);
+
+out:
+       kfree(status);
+}
+
+static unsigned int mmc_calculate_clock(struct mmc_host *host)
+{
+       unsigned int max_dtr = host->f_max;
+
+       if (host->card && !mmc_card_dead(host->card)) {
+               if (mmc_card_highspeed(host->card) && mmc_card_sd(host->card)) {
+                       if (max_dtr > host->card->sw_caps.hs_max_dtr)
+                               max_dtr = host->card->sw_caps.hs_max_dtr;
+               } else if (mmc_card_highspeed(host->card) && !mmc_card_sd(host->card)) {
+                       if (max_dtr > host->card->ext_csd.hs_max_dtr)
+                               max_dtr = host->card->ext_csd.hs_max_dtr;
+               } else if (max_dtr > host->card->csd.max_dtr) {
+                       max_dtr = host->card->csd.max_dtr;
+               }
+       }
+
+       pr_debug("%s: selected %d.%03dMHz transfer rate\n",
+                mmc_hostname(host),
+                max_dtr / 1000000, (max_dtr / 1000) % 1000);
+
+       return max_dtr;
+}
+
+/*
+ * Check whether cards we already know about are still present.
+ * We do this by requesting status, and checking whether a card
+ * responds.
+ *
+ * A request for status does not cause a state change in data
+ * transfer mode.
+ */
+static void mmc_check_card(struct mmc_card *card)
+{
+       struct mmc_command cmd;
+       int err;
+
+       BUG_ON(!card);
+
+       cmd.opcode = MMC_SEND_STATUS;
+       cmd.arg = card->rca << 16;
+       cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+
+       err = mmc_wait_for_cmd(card->host, &cmd, CMD_RETRIES);
+       if (err == MMC_ERR_NONE)
+               return;
+
+       mmc_card_set_dead(card);
+}
+
+static void mmc_setup(struct mmc_host *host)
+{
+       int err;
+       u32 ocr;
+
+       host->mode = MMC_MODE_SD;
+
+       mmc_power_up(host);
+       mmc_idle_cards(host);
+
+       err = mmc_send_if_cond(host, host->ocr_avail, NULL);
+       if (err != MMC_ERR_NONE) {
+               return;
+       }
+       err = mmc_send_app_op_cond(host, 0, &ocr);
+
+       /*
+        * If we fail to detect any SD cards then try
+        * searching for MMC cards.
+        */
+       if (err != MMC_ERR_NONE) {
+               host->mode = MMC_MODE_MMC;
+
+               err = mmc_send_op_cond(host, 0, &ocr);
+               if (err != MMC_ERR_NONE)
+                       return;
+       }
+
+       host->ocr = mmc_select_voltage(host, ocr);
+
+       if (host->ocr == 0)
+               return;
+
+       /*
+        * Since we're changing the OCR value, we seem to
+        * need to tell some cards to go back to the idle
+        * state.  We wait 1ms to give cards time to
+        * respond.
+        */
+       mmc_idle_cards(host);
+
+       /*
+        * Send the selected OCR multiple times... until the cards
+        * all get the idea that they should be ready for CMD2.
+        * (My SanDisk card seems to need this.)
+        */
+       if (host->mode == MMC_MODE_SD) {
+               int err, sd2;
+               err = mmc_send_if_cond(host, host->ocr, &sd2);
+               if (err == MMC_ERR_NONE) {
+                       /*
+                       * If SD_SEND_IF_COND indicates an SD 2.0
+                       * compliant card and we should set bit 30
+                       * of the ocr to indicate that we can handle
+                       * block-addressed SDHC cards.
+                       */
+                       mmc_send_app_op_cond(host, host->ocr | (sd2 << 30), NULL);
+               }
+       } else {
+               /* The extra bit indicates that we support high capacity */
+               mmc_send_op_cond(host, host->ocr | (1 << 30), NULL);
+       }
+
+       mmc_discover_card(host);
+
+       /*
+        * Ok, now switch to push-pull mode.
+        */
+       host->ios.bus_mode = MMC_BUSMODE_PUSHPULL;
+       mmc_set_ios(host);
+
+       mmc_read_csd(host);
+
+       if (host->card && !mmc_card_dead(host->card)) {
+               err = mmc_select_card(host->card);
+               if (err != MMC_ERR_NONE)
+                       mmc_card_set_dead(host->card);
+       }
+
+       if (host->mode == MMC_MODE_SD) {
+               mmc_read_scr(host);
+               mmc_read_switch_caps(host);
+       } else
+               mmc_process_ext_csd(host);
+}
+
+
+/**
+ *     mmc_detect_change - process change of state on a MMC socket
+ *     @host: host which changed state.
+ *     @delay: optional delay to wait before detection (jiffies)
+ *
+ *     All we know is that card(s) have been inserted or removed
+ *     from the socket(s).  We don't know which socket or cards.
+ */
+void mmc_detect_change(struct mmc_host *host, unsigned long delay)
+{
+#ifdef CONFIG_MMC_DEBUG
+       mmc_claim_host(host);
+       BUG_ON(host->removed);
+       mmc_release_host(host);
+#endif
+
+       mmc_schedule_delayed_work(&host->detect, delay);
+}
+
+EXPORT_SYMBOL(mmc_detect_change);
+
+
+static void mmc_rescan(struct work_struct *work)
+{
+       struct mmc_host *host =
+               container_of(work, struct mmc_host, detect.work);
+
+       mmc_claim_host(host);
+
+       /*
+        * Check for removed card and newly inserted ones. We check for
+        * removed cards first so we can intelligently re-select the VDD.
+        */
+       if (host->card) {
+               mmc_check_card(host->card);
+
+               mmc_release_host(host);
+
+               if (mmc_card_dead(host->card)) {
+                       mmc_remove_card(host->card);
+                       host->card = NULL;
+               }
+
+               goto out;
+       }
+
+       mmc_setup(host);
+
+       if (host->card && !mmc_card_dead(host->card)) {
+               /*
+                * (Re-)calculate the fastest clock rate which the
+                * attached cards and the host support.
+                */
+               host->ios.clock = mmc_calculate_clock(host);
+               mmc_set_ios(host);
+       }
+
+       mmc_release_host(host);
+
+       /*
+        * If this is a new and good card, register it.
+        */
+       if (host->card && !mmc_card_dead(host->card)) {
+               if (mmc_register_card(host->card))
+                       mmc_card_set_dead(host->card);
+       }
+
+       /*
+        * If this card is dead, destroy it.
+        */
+       if (host->card && mmc_card_dead(host->card)) {
+               mmc_remove_card(host->card);
+               host->card = NULL;
+       }
+
+out:
+       /*
+        * If we discover that there are no cards on the
+        * bus, turn off the clock and power down.
+        */
+       if (!host->card)
+               mmc_power_off(host);
+}
+
+
+/**
+ *     mmc_alloc_host - initialise the per-host structure.
+ *     @extra: sizeof private data structure
+ *     @dev: pointer to host device model structure
+ *
+ *     Initialise the per-host structure.
+ */
+struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+{
+       struct mmc_host *host;
+
+       host = mmc_alloc_host_sysfs(extra, dev);
+       if (host) {
+               spin_lock_init(&host->lock);
+               init_waitqueue_head(&host->wq);
+               INIT_DELAYED_WORK(&host->detect, mmc_rescan);
+
+               /*
+                * By default, hosts do not support SGIO or large requests.
+                * They have to set these according to their abilities.
+                */
+               host->max_hw_segs = 1;
+               host->max_phys_segs = 1;
+               host->max_seg_size = PAGE_CACHE_SIZE;
+
+               host->max_req_size = PAGE_CACHE_SIZE;
+               host->max_blk_size = 512;
+               host->max_blk_count = PAGE_CACHE_SIZE / 512;
+       }
+
+       return host;
+}
+
+EXPORT_SYMBOL(mmc_alloc_host);
+
+/**
+ *     mmc_add_host - initialise host hardware
+ *     @host: mmc host
+ */
+int mmc_add_host(struct mmc_host *host)
+{
+       int ret;
+
+       ret = mmc_add_host_sysfs(host);
+       if (ret == 0) {
+               mmc_power_off(host);
+               mmc_detect_change(host, 0);
+       }
+
+       return ret;
+}
+
+EXPORT_SYMBOL(mmc_add_host);
+
+/**
+ *     mmc_remove_host - remove host hardware
+ *     @host: mmc host
+ *
+ *     Unregister and remove all cards associated with this host,
+ *     and power down the MMC bus.
+ */
+void mmc_remove_host(struct mmc_host *host)
+{
+#ifdef CONFIG_MMC_DEBUG
+       mmc_claim_host(host);
+       host->removed = 1;
+       mmc_release_host(host);
+#endif
+
+       mmc_flush_scheduled_work();
+
+       if (host->card) {
+               mmc_remove_card(host->card);
+               host->card = NULL;
+       }
+
+       mmc_power_off(host);
+       mmc_remove_host_sysfs(host);
+}
+
+EXPORT_SYMBOL(mmc_remove_host);
+
+/**
+ *     mmc_free_host - free the host structure
+ *     @host: mmc host
+ *
+ *     Free the host once all references to it have been dropped.
+ */
+void mmc_free_host(struct mmc_host *host)
+{
+       mmc_free_host_sysfs(host);
+}
+
+EXPORT_SYMBOL(mmc_free_host);
+
+#ifdef CONFIG_PM
+
+/**
+ *     mmc_suspend_host - suspend a host
+ *     @host: mmc host
+ *     @state: suspend mode (PM_SUSPEND_xxx)
+ */
+int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
+{
+       mmc_flush_scheduled_work();
+
+       if (host->card) {
+               mmc_remove_card(host->card);
+               host->card = NULL;
+       }
+
+       mmc_power_off(host);
+
+       return 0;
+}
+
+EXPORT_SYMBOL(mmc_suspend_host);
+
+/**
+ *     mmc_resume_host - resume a previously suspended host
+ *     @host: mmc host
+ */
+int mmc_resume_host(struct mmc_host *host)
+{
+       mmc_rescan(&host->detect.work);
+
+       return 0;
+}
+
+EXPORT_SYMBOL(mmc_resume_host);
+
+#endif
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
new file mode 100644 (file)
index 0000000..076cb2f
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ *  linux/drivers/mmc/core/core.h
+ *
+ *  Copyright (C) 2003 Russell King, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _MMC_CORE_H
+#define _MMC_CORE_H
+/* core-internal functions */
+void mmc_init_card(struct mmc_card *card, struct mmc_host *host);
+int mmc_register_card(struct mmc_card *card);
+void mmc_remove_card(struct mmc_card *card);
+
+struct mmc_host *mmc_alloc_host_sysfs(int extra, struct device *dev);
+int mmc_add_host_sysfs(struct mmc_host *host);
+void mmc_remove_host_sysfs(struct mmc_host *host);
+void mmc_free_host_sysfs(struct mmc_host *host);
+
+int mmc_schedule_work(struct work_struct *work);
+int mmc_schedule_delayed_work(struct delayed_work *work, unsigned long delay);
+void mmc_flush_scheduled_work(void);
+#endif
diff --git a/drivers/mmc/core/sysfs.c b/drivers/mmc/core/sysfs.c
new file mode 100644 (file)
index 0000000..bf9a5f8
--- /dev/null
@@ -0,0 +1,361 @@
+/*
+ *  linux/drivers/mmc/core/sysfs.c
+ *
+ *  Copyright (C) 2003 Russell King, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *  MMC sysfs/driver model support.
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/idr.h>
+#include <linux/workqueue.h>
+
+#include <linux/mmc/card.h>
+#include <linux/mmc/host.h>
+
+#include "core.h"
+
+#define dev_to_mmc_card(d)     container_of(d, struct mmc_card, dev)
+#define to_mmc_driver(d)       container_of(d, struct mmc_driver, drv)
+#define cls_dev_to_mmc_host(d) container_of(d, struct mmc_host, class_dev)
+
+#define MMC_ATTR(name, fmt, args...)                                   \
+static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf)        \
+{                                                                      \
+       struct mmc_card *card = dev_to_mmc_card(dev);                   \
+       return sprintf(buf, fmt, args);                                 \
+}
+
+MMC_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
+       card->raw_cid[2], card->raw_cid[3]);
+MMC_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
+       card->raw_csd[2], card->raw_csd[3]);
+MMC_ATTR(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]);
+MMC_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year);
+MMC_ATTR(fwrev, "0x%x\n", card->cid.fwrev);
+MMC_ATTR(hwrev, "0x%x\n", card->cid.hwrev);
+MMC_ATTR(manfid, "0x%06x\n", card->cid.manfid);
+MMC_ATTR(name, "%s\n", card->cid.prod_name);
+MMC_ATTR(oemid, "0x%04x\n", card->cid.oemid);
+MMC_ATTR(serial, "0x%08x\n", card->cid.serial);
+
+#define MMC_ATTR_RO(name) __ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
+
+static struct device_attribute mmc_dev_attrs[] = {
+       MMC_ATTR_RO(cid),
+       MMC_ATTR_RO(csd),
+       MMC_ATTR_RO(date),
+       MMC_ATTR_RO(fwrev),
+       MMC_ATTR_RO(hwrev),
+       MMC_ATTR_RO(manfid),
+       MMC_ATTR_RO(name),
+       MMC_ATTR_RO(oemid),
+       MMC_ATTR_RO(serial),
+       __ATTR_NULL
+};
+
+static struct device_attribute mmc_dev_attr_scr = MMC_ATTR_RO(scr);
+
+
+static void mmc_release_card(struct device *dev)
+{
+       struct mmc_card *card = dev_to_mmc_card(dev);
+
+       kfree(card);
+}
+
+/*
+ * This currently matches any MMC driver to any MMC card - drivers
+ * themselves make the decision whether to drive this card in their
+ * probe method.  However, we force "bad" cards to fail.
+ */
+static int mmc_bus_match(struct device *dev, struct device_driver *drv)
+{
+       struct mmc_card *card = dev_to_mmc_card(dev);
+       return !mmc_card_bad(card);
+}
+
+static int
+mmc_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf,
+               int buf_size)
+{
+       struct mmc_card *card = dev_to_mmc_card(dev);
+       char ccc[13];
+       int retval = 0, i = 0, length = 0;
+
+#define add_env(fmt,val) do {                                  \
+       retval = add_uevent_var(envp, num_envp, &i,             \
+                               buf, buf_size, &length,         \
+                               fmt, val);                      \
+       if (retval)                                             \
+               return retval;                                  \
+} while (0);
+
+       for (i = 0; i < 12; i++)
+               ccc[i] = card->csd.cmdclass & (1 << i) ? '1' : '0';
+       ccc[12] = '\0';
+
+       add_env("MMC_CCC=%s", ccc);
+       add_env("MMC_MANFID=%06x", card->cid.manfid);
+       add_env("MMC_NAME=%s", mmc_card_name(card));
+       add_env("MMC_OEMID=%04x", card->cid.oemid);
+#undef add_env
+       envp[i] = NULL;
+
+       return 0;
+}
+
+static int mmc_bus_suspend(struct device *dev, pm_message_t state)
+{
+       struct mmc_driver *drv = to_mmc_driver(dev->driver);
+       struct mmc_card *card = dev_to_mmc_card(dev);
+       int ret = 0;
+
+       if (dev->driver && drv->suspend)
+               ret = drv->suspend(card, state);
+       return ret;
+}
+
+static int mmc_bus_resume(struct device *dev)
+{
+       struct mmc_driver *drv = to_mmc_driver(dev->driver);
+       struct mmc_card *card = dev_to_mmc_card(dev);
+       int ret = 0;
+
+       if (dev->driver && drv->resume)
+               ret = drv->resume(card);
+       return ret;
+}
+
+static int mmc_bus_probe(struct device *dev)
+{
+       struct mmc_driver *drv = to_mmc_driver(dev->driver);
+       struct mmc_card *card = dev_to_mmc_card(dev);
+
+       return drv->probe(card);
+}
+
+static int mmc_bus_remove(struct device *dev)
+{
+       struct mmc_driver *drv = to_mmc_driver(dev->driver);
+       struct mmc_card *card = dev_to_mmc_card(dev);
+
+       drv->remove(card);
+
+       return 0;
+}
+
+static struct bus_type mmc_bus_type = {
+       .name           = "mmc",
+       .dev_attrs      = mmc_dev_attrs,
+       .match          = mmc_bus_match,
+       .uevent         = mmc_bus_uevent,
+       .probe          = mmc_bus_probe,
+       .remove         = mmc_bus_remove,
+       .suspend        = mmc_bus_suspend,
+       .resume         = mmc_bus_resume,
+};
+
+/**
+ *     mmc_register_driver - register a media driver
+ *     @drv: MMC media driver
+ */
+int mmc_register_driver(struct mmc_driver *drv)
+{
+       drv->drv.bus = &mmc_bus_type;
+       return driver_register(&drv->drv);
+}
+
+EXPORT_SYMBOL(mmc_register_driver);
+
+/**
+ *     mmc_unregister_driver - unregister a media driver
+ *     @drv: MMC media driver
+ */
+void mmc_unregister_driver(struct mmc_driver *drv)
+{
+       drv->drv.bus = &mmc_bus_type;
+       driver_unregister(&drv->drv);
+}
+
+EXPORT_SYMBOL(mmc_unregister_driver);
+
+
+/*
+ * Internal function.  Initialise a MMC card structure.
+ */
+void mmc_init_card(struct mmc_card *card, struct mmc_host *host)
+{
+       memset(card, 0, sizeof(struct mmc_card));
+       card->host = host;
+       device_initialize(&card->dev);
+       card->dev.parent = mmc_classdev(host);
+       card->dev.bus = &mmc_bus_type;
+       card->dev.release = mmc_release_card;
+}
+
+/*
+ * Internal function.  Register a new MMC card with the driver model.
+ */
+int mmc_register_card(struct mmc_card *card)
+{
+       int ret;
+
+       snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),
+                "%s:%04x", mmc_hostname(card->host), card->rca);
+
+       ret = device_add(&card->dev);
+       if (ret == 0) {
+               if (mmc_card_sd(card)) {
+                       ret = device_create_file(&card->dev, &mmc_dev_attr_scr);
+                       if (ret)
+                               device_del(&card->dev);
+               }
+       }
+       if (ret == 0)
+               mmc_card_set_present(card);
+       return ret;
+}
+
+/*
+ * Internal function.  Unregister a new MMC card with the
+ * driver model, and (eventually) free it.
+ */
+void mmc_remove_card(struct mmc_card *card)
+{
+       if (mmc_card_present(card)) {
+               if (mmc_card_sd(card))
+                       device_remove_file(&card->dev, &mmc_dev_attr_scr);
+
+               device_del(&card->dev);
+       }
+
+       put_device(&card->dev);
+}
+
+
+static void mmc_host_classdev_release(struct device *dev)
+{
+       struct mmc_host *host = cls_dev_to_mmc_host(dev);
+       kfree(host);
+}
+
+static struct class mmc_host_class = {
+       .name           = "mmc_host",
+       .dev_release    = mmc_host_classdev_release,
+};
+
+static DEFINE_IDR(mmc_host_idr);
+static DEFINE_SPINLOCK(mmc_host_lock);
+
+/*
+ * Internal function. Allocate a new MMC host.
+ */
+struct mmc_host *mmc_alloc_host_sysfs(int extra, struct device *dev)
+{
+       struct mmc_host *host;
+
+       host = kmalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL);
+       if (host) {
+               memset(host, 0, sizeof(struct mmc_host) + extra);
+
+               host->parent = dev;
+               host->class_dev.parent = dev;
+               host->class_dev.class = &mmc_host_class;
+               device_initialize(&host->class_dev);
+       }
+
+       return host;
+}
+
+/*
+ * Internal function. Register a new MMC host with the MMC class.
+ */
+int mmc_add_host_sysfs(struct mmc_host *host)
+{
+       int err;
+
+       if (!idr_pre_get(&mmc_host_idr, GFP_KERNEL))
+               return -ENOMEM;
+
+       spin_lock(&mmc_host_lock);
+       err = idr_get_new(&mmc_host_idr, host, &host->index);
+       spin_unlock(&mmc_host_lock);
+       if (err)
+               return err;
+
+       snprintf(host->class_dev.bus_id, BUS_ID_SIZE,
+                "mmc%d", host->index);
+
+       return device_add(&host->class_dev);
+}
+
+/*
+ * Internal function. Unregister a MMC host with the MMC class.
+ */
+void mmc_remove_host_sysfs(struct mmc_host *host)
+{
+       device_del(&host->class_dev);
+
+       spin_lock(&mmc_host_lock);
+       idr_remove(&mmc_host_idr, host->index);
+       spin_unlock(&mmc_host_lock);
+}
+
+/*
+ * Internal function. Free a MMC host.
+ */
+void mmc_free_host_sysfs(struct mmc_host *host)
+{
+       put_device(&host->class_dev);
+}
+
+static struct workqueue_struct *workqueue;
+
+/*
+ * Internal function. Schedule delayed work in the MMC work queue.
+ */
+int mmc_schedule_delayed_work(struct delayed_work *work, unsigned long delay)
+{
+       return queue_delayed_work(workqueue, work, delay);
+}
+
+/*
+ * Internal function. Flush all scheduled work from the MMC work queue.
+ */
+void mmc_flush_scheduled_work(void)
+{
+       flush_workqueue(workqueue);
+}
+
+static int __init mmc_init(void)
+{
+       int ret;
+
+       workqueue = create_singlethread_workqueue("kmmcd");
+       if (!workqueue)
+               return -ENOMEM;
+
+       ret = bus_register(&mmc_bus_type);
+       if (ret == 0) {
+               ret = class_register(&mmc_host_class);
+               if (ret)
+                       bus_unregister(&mmc_bus_type);
+       }
+       return ret;
+}
+
+static void __exit mmc_exit(void)
+{
+       class_unregister(&mmc_host_class);
+       bus_unregister(&mmc_bus_type);
+       destroy_workqueue(workqueue);
+}
+
+module_init(mmc_init);
+module_exit(mmc_exit);
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
deleted file mode 100644 (file)
index 3f50b88..0000000
+++ /dev/null
@@ -1,1638 +0,0 @@
-/*
- *  linux/drivers/mmc/mmc.c
- *
- *  Copyright (C) 2003-2004 Russell King, All Rights Reserved.
- *  SD support Copyright (C) 2004 Ian Molton, All Rights Reserved.
- *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
- *  MMCv4 support Copyright (C) 2006 Philip Langdale, All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/completion.h>
-#include <linux/device.h>
-#include <linux/delay.h>
-#include <linux/pagemap.h>
-#include <linux/err.h>
-#include <asm/scatterlist.h>
-#include <linux/scatterlist.h>
-
-#include <linux/mmc/card.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/protocol.h>
-
-#include "mmc.h"
-
-#define CMD_RETRIES    3
-
-/*
- * OCR Bit positions to 10s of Vdd mV.
- */
-static const unsigned short mmc_ocr_bit_to_vdd[] = {
-       150,    155,    160,    165,    170,    180,    190,    200,
-       210,    220,    230,    240,    250,    260,    270,    280,
-       290,    300,    310,    320,    330,    340,    350,    360
-};
-
-static const unsigned int tran_exp[] = {
-       10000,          100000,         1000000,        10000000,
-       0,              0,              0,              0
-};
-
-static const unsigned char tran_mant[] = {
-       0,      10,     12,     13,     15,     20,     25,     30,
-       35,     40,     45,     50,     55,     60,     70,     80,
-};
-
-static const unsigned int tacc_exp[] = {
-       1,      10,     100,    1000,   10000,  100000, 1000000, 10000000,
-};
-
-static const unsigned int tacc_mant[] = {
-       0,      10,     12,     13,     15,     20,     25,     30,
-       35,     40,     45,     50,     55,     60,     70,     80,
-};
-
-
-/**
- *     mmc_request_done - finish processing an MMC request
- *     @host: MMC host which completed request
- *     @mrq: MMC request which request
- *
- *     MMC drivers should call this function when they have completed
- *     their processing of a request.
- */
-void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
-{
-       struct mmc_command *cmd = mrq->cmd;
-       int err = cmd->error;
-
-       pr_debug("%s: req done (CMD%u): %d/%d/%d: %08x %08x %08x %08x\n",
-                mmc_hostname(host), cmd->opcode, err,
-                mrq->data ? mrq->data->error : 0,
-                mrq->stop ? mrq->stop->error : 0,
-                cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
-
-       if (err && cmd->retries) {
-               cmd->retries--;
-               cmd->error = 0;
-               host->ops->request(host, mrq);
-       } else if (mrq->done) {
-               mrq->done(mrq);
-       }
-}
-
-EXPORT_SYMBOL(mmc_request_done);
-
-/**
- *     mmc_start_request - start a command on a host
- *     @host: MMC host to start command on
- *     @mrq: MMC request to start
- *
- *     Queue a command on the specified host.  We expect the
- *     caller to be holding the host lock with interrupts disabled.
- */
-void
-mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
-{
-#ifdef CONFIG_MMC_DEBUG
-       unsigned int i, sz;
-#endif
-
-       pr_debug("%s: starting CMD%u arg %08x flags %08x\n",
-                mmc_hostname(host), mrq->cmd->opcode,
-                mrq->cmd->arg, mrq->cmd->flags);
-
-       WARN_ON(!host->claimed);
-
-       mrq->cmd->error = 0;
-       mrq->cmd->mrq = mrq;
-       if (mrq->data) {
-               BUG_ON(mrq->data->blksz > host->max_blk_size);
-               BUG_ON(mrq->data->blocks > host->max_blk_count);
-               BUG_ON(mrq->data->blocks * mrq->data->blksz >
-                       host->max_req_size);
-
-#ifdef CONFIG_MMC_DEBUG
-               sz = 0;
-               for (i = 0;i < mrq->data->sg_len;i++)
-                       sz += mrq->data->sg[i].length;
-               BUG_ON(sz != mrq->data->blocks * mrq->data->blksz);
-#endif
-
-               mrq->cmd->data = mrq->data;
-               mrq->data->error = 0;
-               mrq->data->mrq = mrq;
-               if (mrq->stop) {
-                       mrq->data->stop = mrq->stop;
-                       mrq->stop->error = 0;
-                       mrq->stop->mrq = mrq;
-               }
-       }
-       host->ops->request(host, mrq);
-}
-
-EXPORT_SYMBOL(mmc_start_request);
-
-static void mmc_wait_done(struct mmc_request *mrq)
-{
-       complete(mrq->done_data);
-}
-
-int mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq)
-{
-       DECLARE_COMPLETION_ONSTACK(complete);
-
-       mrq->done_data = &complete;
-       mrq->done = mmc_wait_done;
-
-       mmc_start_request(host, mrq);
-
-       wait_for_completion(&complete);
-
-       return 0;
-}
-
-EXPORT_SYMBOL(mmc_wait_for_req);
-
-/**
- *     mmc_wait_for_cmd - start a command and wait for completion
- *     @host: MMC host to start command
- *     @cmd: MMC command to start
- *     @retries: maximum number of retries
- *
- *     Start a new MMC command for a host, and wait for the command
- *     to complete.  Return any error that occurred while the command
- *     was executing.  Do not attempt to parse the response.
- */
-int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries)
-{
-       struct mmc_request mrq;
-
-       BUG_ON(!host->claimed);
-
-       memset(&mrq, 0, sizeof(struct mmc_request));
-
-       memset(cmd->resp, 0, sizeof(cmd->resp));
-       cmd->retries = retries;
-
-       mrq.cmd = cmd;
-       cmd->data = NULL;
-
-       mmc_wait_for_req(host, &mrq);
-
-       return cmd->error;
-}
-
-EXPORT_SYMBOL(mmc_wait_for_cmd);
-
-/**
- *     mmc_wait_for_app_cmd - start an application command and wait for
-                              completion
- *     @host: MMC host to start command
- *     @rca: RCA to send MMC_APP_CMD to
- *     @cmd: MMC command to start
- *     @retries: maximum number of retries
- *
- *     Sends a MMC_APP_CMD, checks the card response, sends the command
- *     in the parameter and waits for it to complete. Return any error
- *     that occurred while the command was executing.  Do not attempt to
- *     parse the response.
- */
-int mmc_wait_for_app_cmd(struct mmc_host *host, unsigned int rca,
-       struct mmc_command *cmd, int retries)
-{
-       struct mmc_request mrq;
-       struct mmc_command appcmd;
-
-       int i, err;
-
-       BUG_ON(!host->claimed);
-       BUG_ON(retries < 0);
-
-       err = MMC_ERR_INVALID;
-
-       /*
-        * We have to resend MMC_APP_CMD for each attempt so
-        * we cannot use the retries field in mmc_command.
-        */
-       for (i = 0;i <= retries;i++) {
-               memset(&mrq, 0, sizeof(struct mmc_request));
-
-               appcmd.opcode = MMC_APP_CMD;
-               appcmd.arg = rca << 16;
-               appcmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-               appcmd.retries = 0;
-               memset(appcmd.resp, 0, sizeof(appcmd.resp));
-               appcmd.data = NULL;
-
-               mrq.cmd = &appcmd;
-               appcmd.data = NULL;
-
-               mmc_wait_for_req(host, &mrq);
-
-               if (appcmd.error) {
-                       err = appcmd.error;
-                       continue;
-               }
-
-               /* Check that card supported application commands */
-               if (!(appcmd.resp[0] & R1_APP_CMD))
-                       return MMC_ERR_FAILED;
-
-               memset(&mrq, 0, sizeof(struct mmc_request));
-
-               memset(cmd->resp, 0, sizeof(cmd->resp));
-               cmd->retries = 0;
-
-               mrq.cmd = cmd;
-               cmd->data = NULL;
-
-               mmc_wait_for_req(host, &mrq);
-
-               err = cmd->error;
-               if (cmd->error == MMC_ERR_NONE)
-                       break;
-       }
-
-       return err;
-}
-
-EXPORT_SYMBOL(mmc_wait_for_app_cmd);
-
-/**
- *     mmc_set_data_timeout - set the timeout for a data command
- *     @data: data phase for command
- *     @card: the MMC card associated with the data transfer
- *     @write: flag to differentiate reads from writes
- */
-void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card,
-                         int write)
-{
-       unsigned int mult;
-
-       /*
-        * SD cards use a 100 multiplier rather than 10
-        */
-       mult = mmc_card_sd(card) ? 100 : 10;
-
-       /*
-        * Scale up the multiplier (and therefore the timeout) by
-        * the r2w factor for writes.
-        */
-       if (write)
-               mult <<= card->csd.r2w_factor;
-
-       data->timeout_ns = card->csd.tacc_ns * mult;
-       data->timeout_clks = card->csd.tacc_clks * mult;
-
-       /*
-        * SD cards also have an upper limit on the timeout.
-        */
-       if (mmc_card_sd(card)) {
-               unsigned int timeout_us, limit_us;
-
-               timeout_us = data->timeout_ns / 1000;
-               timeout_us += data->timeout_clks * 1000 /
-                       (card->host->ios.clock / 1000);
-
-               if (write)
-                       limit_us = 250000;
-               else
-                       limit_us = 100000;
-
-               /*
-                * SDHC cards always use these fixed values.
-                */
-               if (timeout_us > limit_us || mmc_card_blockaddr(card)) {
-                       data->timeout_ns = limit_us * 1000;
-                       data->timeout_clks = 0;
-               }
-       }
-}
-EXPORT_SYMBOL(mmc_set_data_timeout);
-
-/**
- *     __mmc_claim_host - exclusively claim a host
- *     @host: mmc host to claim
- *     @card: mmc card to claim host for
- *
- *     Claim a host for a set of operations.  If a valid card
- *     is passed and this wasn't the last card selected, select
- *     the card before returning.
- *
- *     Note: you should use mmc_card_claim_host or mmc_claim_host.
- */
-void mmc_claim_host(struct mmc_host *host)
-{
-       DECLARE_WAITQUEUE(wait, current);
-       unsigned long flags;
-
-       add_wait_queue(&host->wq, &wait);
-       spin_lock_irqsave(&host->lock, flags);
-       while (1) {
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               if (!host->claimed)
-                       break;
-               spin_unlock_irqrestore(&host->lock, flags);
-               schedule();
-               spin_lock_irqsave(&host->lock, flags);
-       }
-       set_current_state(TASK_RUNNING);
-       host->claimed = 1;
-       spin_unlock_irqrestore(&host->lock, flags);
-       remove_wait_queue(&host->wq, &wait);
-}
-
-EXPORT_SYMBOL(mmc_claim_host);
-
-/**
- *     mmc_release_host - release a host
- *     @host: mmc host to release
- *
- *     Release a MMC host, allowing others to claim the host
- *     for their operations.
- */
-void mmc_release_host(struct mmc_host *host)
-{
-       unsigned long flags;
-
-       BUG_ON(!host->claimed);
-
-       spin_lock_irqsave(&host->lock, flags);
-       host->claimed = 0;
-       spin_unlock_irqrestore(&host->lock, flags);
-
-       wake_up(&host->wq);
-}
-
-EXPORT_SYMBOL(mmc_release_host);
-
-static inline void mmc_set_ios(struct mmc_host *host)
-{
-       struct mmc_ios *ios = &host->ios;
-
-       pr_debug("%s: clock %uHz busmode %u powermode %u cs %u Vdd %u "
-               "width %u timing %u\n",
-                mmc_hostname(host), ios->clock, ios->bus_mode,
-                ios->power_mode, ios->chip_select, ios->vdd,
-                ios->bus_width, ios->timing);
-
-       host->ops->set_ios(host, ios);
-}
-
-static int mmc_select_card(struct mmc_card *card)
-{
-       int err;
-       struct mmc_command cmd;
-
-       BUG_ON(!card->host->claimed);
-
-       cmd.opcode = MMC_SELECT_CARD;
-       cmd.arg = card->rca << 16;
-       cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-       err = mmc_wait_for_cmd(card->host, &cmd, CMD_RETRIES);
-       if (err != MMC_ERR_NONE)
-               return err;
-
-       /*
-        * We can only change the bus width of SD cards when
-        * they are selected so we have to put the handling
-        * here.
-        *
-        * The card is in 1 bit mode by default so
-        * we only need to change if it supports the
-        * wider version.
-        */
-       if (mmc_card_sd(card) &&
-               (card->scr.bus_widths & SD_SCR_BUS_WIDTH_4) &&
-               (card->host->caps & MMC_CAP_4_BIT_DATA)) {
-
-               struct mmc_command cmd;
-               cmd.opcode = SD_APP_SET_BUS_WIDTH;
-               cmd.arg = SD_BUS_WIDTH_4;
-               cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-               err = mmc_wait_for_app_cmd(card->host, card->rca,
-                       &cmd, CMD_RETRIES);
-               if (err != MMC_ERR_NONE)
-                       return err;
-
-               card->host->ios.bus_width = MMC_BUS_WIDTH_4;
-               mmc_set_ios(card->host);
-       }
-
-       return MMC_ERR_NONE;
-}
-
-
-static inline void mmc_delay(unsigned int ms)
-{
-       if (ms < 1000 / HZ) {
-               cond_resched();
-               mdelay(ms);
-       } else {
-               msleep(ms);
-       }
-}
-
-/*
- * Mask off any voltages we don't support and select
- * the lowest voltage
- */
-static u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
-{
-       int bit;
-
-       ocr &= host->ocr_avail;
-
-       bit = ffs(ocr);
-       if (bit) {
-               bit -= 1;
-
-               ocr &= 3 << bit;
-
-               host->ios.vdd = bit;
-               mmc_set_ios(host);
-       } else {
-               ocr = 0;
-       }
-
-       return ocr;
-}
-
-#define UNSTUFF_BITS(resp,start,size)                                  \
-       ({                                                              \
-               const int __size = size;                                \
-               const u32 __mask = (__size < 32 ? 1 << __size : 0) - 1; \
-               const int __off = 3 - ((start) / 32);                   \
-               const int __shft = (start) & 31;                        \
-               u32 __res;                                              \
-                                                                       \
-               __res = resp[__off] >> __shft;                          \
-               if (__size + __shft > 32)                               \
-                       __res |= resp[__off-1] << ((32 - __shft) % 32); \
-               __res & __mask;                                         \
-       })
-
-/*
- * Given the decoded CSD structure, decode the raw CID to our CID structure.
- */
-static void mmc_decode_cid(struct mmc_card *card)
-{
-       u32 *resp = card->raw_cid;
-
-       memset(&card->cid, 0, sizeof(struct mmc_cid));
-
-       if (mmc_card_sd(card)) {
-               /*
-                * SD doesn't currently have a version field so we will
-                * have to assume we can parse this.
-                */
-               card->cid.manfid                = UNSTUFF_BITS(resp, 120, 8);
-               card->cid.oemid                 = UNSTUFF_BITS(resp, 104, 16);
-               card->cid.prod_name[0]          = UNSTUFF_BITS(resp, 96, 8);
-               card->cid.prod_name[1]          = UNSTUFF_BITS(resp, 88, 8);
-               card->cid.prod_name[2]          = UNSTUFF_BITS(resp, 80, 8);
-               card->cid.prod_name[3]          = UNSTUFF_BITS(resp, 72, 8);
-               card->cid.prod_name[4]          = UNSTUFF_BITS(resp, 64, 8);
-               card->cid.hwrev                 = UNSTUFF_BITS(resp, 60, 4);
-               card->cid.fwrev                 = UNSTUFF_BITS(resp, 56, 4);
-               card->cid.serial                = UNSTUFF_BITS(resp, 24, 32);
-               card->cid.year                  = UNSTUFF_BITS(resp, 12, 8);
-               card->cid.month                 = UNSTUFF_BITS(resp, 8, 4);
-
-               card->cid.year += 2000; /* SD cards year offset */
-       } else {
-               /*
-                * The selection of the format here is based upon published
-                * specs from sandisk and from what people have reported.
-                */
-               switch (card->csd.mmca_vsn) {
-               case 0: /* MMC v1.0 - v1.2 */
-               case 1: /* MMC v1.4 */
-                       card->cid.manfid        = UNSTUFF_BITS(resp, 104, 24);
-                       card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
-                       card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
-                       card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
-                       card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
-                       card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
-                       card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
-                       card->cid.prod_name[6]  = UNSTUFF_BITS(resp, 48, 8);
-                       card->cid.hwrev         = UNSTUFF_BITS(resp, 44, 4);
-                       card->cid.fwrev         = UNSTUFF_BITS(resp, 40, 4);
-                       card->cid.serial        = UNSTUFF_BITS(resp, 16, 24);
-                       card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
-                       card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
-                       break;
-
-               case 2: /* MMC v2.0 - v2.2 */
-               case 3: /* MMC v3.1 - v3.3 */
-               case 4: /* MMC v4 */
-                       card->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
-                       card->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
-                       card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
-                       card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
-                       card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
-                       card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
-                       card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
-                       card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
-                       card->cid.serial        = UNSTUFF_BITS(resp, 16, 32);
-                       card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
-                       card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
-                       break;
-
-               default:
-                       printk("%s: card has unknown MMCA version %d\n",
-                               mmc_hostname(card->host), card->csd.mmca_vsn);
-                       mmc_card_set_bad(card);
-                       break;
-               }
-       }
-}
-
-/*
- * Given a 128-bit response, decode to our card CSD structure.
- */
-static void mmc_decode_csd(struct mmc_card *card)
-{
-       struct mmc_csd *csd = &card->csd;
-       unsigned int e, m, csd_struct;
-       u32 *resp = card->raw_csd;
-
-       if (mmc_card_sd(card)) {
-               csd_struct = UNSTUFF_BITS(resp, 126, 2);
-
-               switch (csd_struct) {
-               case 0:
-                       m = UNSTUFF_BITS(resp, 115, 4);
-                       e = UNSTUFF_BITS(resp, 112, 3);
-                       csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
-                       csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
-
-                       m = UNSTUFF_BITS(resp, 99, 4);
-                       e = UNSTUFF_BITS(resp, 96, 3);
-                       csd->max_dtr      = tran_exp[e] * tran_mant[m];
-                       csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
-
-                       e = UNSTUFF_BITS(resp, 47, 3);
-                       m = UNSTUFF_BITS(resp, 62, 12);
-                       csd->capacity     = (1 + m) << (e + 2);
-
-                       csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
-                       csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
-                       csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
-                       csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
-                       csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
-                       csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
-                       csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
-                       break;
-               case 1:
-                       /*
-                        * This is a block-addressed SDHC card. Most
-                        * interesting fields are unused and have fixed
-                        * values. To avoid getting tripped by buggy cards,
-                        * we assume those fixed values ourselves.
-                        */
-                       mmc_card_set_blockaddr(card);
-
-                       csd->tacc_ns     = 0; /* Unused */
-                       csd->tacc_clks   = 0; /* Unused */
-
-                       m = UNSTUFF_BITS(resp, 99, 4);
-                       e = UNSTUFF_BITS(resp, 96, 3);
-                       csd->max_dtr      = tran_exp[e] * tran_mant[m];
-                       csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
-
-                       m = UNSTUFF_BITS(resp, 48, 22);
-                       csd->capacity     = (1 + m) << 10;
-
-                       csd->read_blkbits = 9;
-                       csd->read_partial = 0;
-                       csd->write_misalign = 0;
-                       csd->read_misalign = 0;
-                       csd->r2w_factor = 4; /* Unused */
-                       csd->write_blkbits = 9;
-                       csd->write_partial = 0;
-                       break;
-               default:
-                       printk("%s: unrecognised CSD structure version %d\n",
-                               mmc_hostname(card->host), csd_struct);
-                       mmc_card_set_bad(card);
-                       return;
-               }
-       } else {
-               /*
-                * We only understand CSD structure v1.1 and v1.2.
-                * v1.2 has extra information in bits 15, 11 and 10.
-                */
-               csd_struct = UNSTUFF_BITS(resp, 126, 2);
-               if (csd_struct != 1 && csd_struct != 2) {
-                       printk("%s: unrecognised CSD structure version %d\n",
-                               mmc_hostname(card->host), csd_struct);
-                       mmc_card_set_bad(card);
-                       return;
-               }
-
-               csd->mmca_vsn    = UNSTUFF_BITS(resp, 122, 4);
-               m = UNSTUFF_BITS(resp, 115, 4);
-               e = UNSTUFF_BITS(resp, 112, 3);
-               csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
-               csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
-
-               m = UNSTUFF_BITS(resp, 99, 4);
-               e = UNSTUFF_BITS(resp, 96, 3);
-               csd->max_dtr      = tran_exp[e] * tran_mant[m];
-               csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
-
-               e = UNSTUFF_BITS(resp, 47, 3);
-               m = UNSTUFF_BITS(resp, 62, 12);
-               csd->capacity     = (1 + m) << (e + 2);
-
-               csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
-               csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
-               csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
-               csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
-               csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3);
-               csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4);
-               csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
-       }
-}
-
-/*
- * Given a 64-bit response, decode to our card SCR structure.
- */
-static void mmc_decode_scr(struct mmc_card *card)
-{
-       struct sd_scr *scr = &card->scr;
-       unsigned int scr_struct;
-       u32 resp[4];
-
-       BUG_ON(!mmc_card_sd(card));
-
-       resp[3] = card->raw_scr[1];
-       resp[2] = card->raw_scr[0];
-
-       scr_struct = UNSTUFF_BITS(resp, 60, 4);
-       if (scr_struct != 0) {
-               printk("%s: unrecognised SCR structure version %d\n",
-                       mmc_hostname(card->host), scr_struct);
-               mmc_card_set_bad(card);
-               return;
-       }
-
-       scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
-       scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
-}
-
-/*
- * Allocate a new MMC card
- */
-static struct mmc_card *
-mmc_alloc_card(struct mmc_host *host, u32 *raw_cid)
-{
-       struct mmc_card *card;
-
-       card = kmalloc(sizeof(struct mmc_card), GFP_KERNEL);
-       if (!card)
-               return ERR_PTR(-ENOMEM);
-
-       mmc_init_card(card, host);
-       memcpy(card->raw_cid, raw_cid, sizeof(card->raw_cid));
-
-       return card;
-}
-
-/*
- * Tell attached cards to go to IDLE state
- */
-static void mmc_idle_cards(struct mmc_host *host)
-{
-       struct mmc_command cmd;
-
-       host->ios.chip_select = MMC_CS_HIGH;
-       mmc_set_ios(host);
-
-       mmc_delay(1);
-
-       cmd.opcode = MMC_GO_IDLE_STATE;
-       cmd.arg = 0;
-       cmd.flags = MMC_RSP_NONE | MMC_CMD_BC;
-
-       mmc_wait_for_cmd(host, &cmd, 0);
-
-       mmc_delay(1);
-
-       host->ios.chip_select = MMC_CS_DONTCARE;
-       mmc_set_ios(host);
-
-       mmc_delay(1);
-}
-
-/*
- * Apply power to the MMC stack.  This is a two-stage process.
- * First, we enable power to the card without the clock running.
- * We then wait a bit for the power to stabilise.  Finally,
- * enable the bus drivers and clock to the card.
- *
- * We must _NOT_ enable the clock prior to power stablising.
- *
- * If a host does all the power sequencing itself, ignore the
- * initial MMC_POWER_UP stage.
- */
-static void mmc_power_up(struct mmc_host *host)
-{
-       int bit = fls(host->ocr_avail) - 1;
-
-       host->ios.vdd = bit;
-       host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
-       host->ios.chip_select = MMC_CS_DONTCARE;
-       host->ios.power_mode = MMC_POWER_UP;
-       host->ios.bus_width = MMC_BUS_WIDTH_1;
-       host->ios.timing = MMC_TIMING_LEGACY;
-       mmc_set_ios(host);
-
-       mmc_delay(1);
-
-       host->ios.clock = host->f_min;
-       host->ios.power_mode = MMC_POWER_ON;
-       mmc_set_ios(host);
-
-       mmc_delay(2);
-}
-
-static void mmc_power_off(struct mmc_host *host)
-{
-       host->ios.clock = 0;
-       host->ios.vdd = 0;
-       host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
-       host->ios.chip_select = MMC_CS_DONTCARE;
-       host->ios.power_mode = MMC_POWER_OFF;
-       host->ios.bus_width = MMC_BUS_WIDTH_1;
-       host->ios.timing = MMC_TIMING_LEGACY;
-       mmc_set_ios(host);
-}
-
-static int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
-{
-       struct mmc_command cmd;
-       int i, err = 0;
-
-       cmd.opcode = MMC_SEND_OP_COND;
-       cmd.arg = ocr;
-       cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
-
-       for (i = 100; i; i--) {
-               err = mmc_wait_for_cmd(host, &cmd, 0);
-               if (err != MMC_ERR_NONE)
-                       break;
-
-               if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
-                       break;
-
-               err = MMC_ERR_TIMEOUT;
-
-               mmc_delay(10);
-       }
-
-       if (rocr)
-               *rocr = cmd.resp[0];
-
-       return err;
-}
-
-static int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
-{
-       struct mmc_command cmd;
-       int i, err = 0;
-
-       cmd.opcode = SD_APP_OP_COND;
-       cmd.arg = ocr;
-       cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
-
-       for (i = 100; i; i--) {
-               err = mmc_wait_for_app_cmd(host, 0, &cmd, CMD_RETRIES);
-               if (err != MMC_ERR_NONE)
-                       break;
-
-               if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
-                       break;
-
-               err = MMC_ERR_TIMEOUT;
-
-               mmc_delay(10);
-       }
-
-       if (rocr)
-               *rocr = cmd.resp[0];
-
-       return err;
-}
-
-static int mmc_send_if_cond(struct mmc_host *host, u32 ocr, int *rsd2)
-{
-       struct mmc_command cmd;
-       int err, sd2;
-       static const u8 test_pattern = 0xAA;
-
-       /*
-       * To support SD 2.0 cards, we must always invoke SD_SEND_IF_COND
-       * before SD_APP_OP_COND. This command will harmlessly fail for
-       * SD 1.0 cards.
-       */
-       cmd.opcode = SD_SEND_IF_COND;
-       cmd.arg = ((ocr & 0xFF8000) != 0) << 8 | test_pattern;
-       cmd.flags = MMC_RSP_R7 | MMC_CMD_BCR;
-
-       err = mmc_wait_for_cmd(host, &cmd, 0);
-       if (err == MMC_ERR_NONE) {
-               if ((cmd.resp[0] & 0xFF) == test_pattern) {
-                       sd2 = 1;
-               } else {
-                       sd2 = 0;
-                       err = MMC_ERR_FAILED;
-               }
-       } else {
-               /*
-                * Treat errors as SD 1.0 card.
-                */
-               sd2 = 0;
-               err = MMC_ERR_NONE;
-       }
-       if (rsd2)
-               *rsd2 = sd2;
-       return err;
-}
-
-/*
- * Discover the card by requesting its CID.
- *
- * Create a mmc_card entry for the discovered card, assigning
- * it an RCA, and save the raw CID for decoding later.
- */
-static void mmc_discover_card(struct mmc_host *host)
-{
-       unsigned int err;
-
-       struct mmc_command cmd;
-
-       BUG_ON(host->card);
-
-       cmd.opcode = MMC_ALL_SEND_CID;
-       cmd.arg = 0;
-       cmd.flags = MMC_RSP_R2 | MMC_CMD_BCR;
-
-       err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-       if (err == MMC_ERR_TIMEOUT) {
-               err = MMC_ERR_NONE;
-               return;
-       }
-       if (err != MMC_ERR_NONE) {
-               printk(KERN_ERR "%s: error requesting CID: %d\n",
-                       mmc_hostname(host), err);
-               return;
-       }
-
-       host->card = mmc_alloc_card(host, cmd.resp);
-       if (IS_ERR(host->card)) {
-               err = PTR_ERR(host->card);
-               host->card = NULL;
-               return;
-       }
-
-       if (host->mode == MMC_MODE_SD) {
-               host->card->type = MMC_TYPE_SD;
-
-               cmd.opcode = SD_SEND_RELATIVE_ADDR;
-               cmd.arg = 0;
-               cmd.flags = MMC_RSP_R6 | MMC_CMD_BCR;
-
-               err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-               if (err != MMC_ERR_NONE)
-                       mmc_card_set_dead(host->card);
-               else {
-                       host->card->rca = cmd.resp[0] >> 16;
-
-                       if (!host->ops->get_ro) {
-                               printk(KERN_WARNING "%s: host does not "
-                                       "support reading read-only "
-                                       "switch. assuming write-enable.\n",
-                                       mmc_hostname(host));
-                       } else {
-                               if (host->ops->get_ro(host))
-                                       mmc_card_set_readonly(host->card);
-                       }
-               }
-       } else {
-               host->card->type = MMC_TYPE_MMC;
-               host->card->rca = 1;
-
-               cmd.opcode = MMC_SET_RELATIVE_ADDR;
-               cmd.arg = host->card->rca << 16;
-               cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-               err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-               if (err != MMC_ERR_NONE)
-                       mmc_card_set_dead(host->card);
-       }
-}
-
-static void mmc_read_csd(struct mmc_host *host)
-{
-       struct mmc_command cmd;
-       int err;
-
-       if (!host->card)
-               return;
-       if (mmc_card_dead(host->card))
-               return;
-
-       cmd.opcode = MMC_SEND_CSD;
-       cmd.arg = host->card->rca << 16;
-       cmd.flags = MMC_RSP_R2 | MMC_CMD_AC;
-
-       err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-       if (err != MMC_ERR_NONE) {
-               mmc_card_set_dead(host->card);
-               return;
-       }
-
-       memcpy(host->card->raw_csd, cmd.resp, sizeof(host->card->raw_csd));
-
-       mmc_decode_csd(host->card);
-       mmc_decode_cid(host->card);
-}
-
-static void mmc_process_ext_csd(struct mmc_host *host)
-{
-       int err;
-
-       struct mmc_request mrq;
-       struct mmc_command cmd;
-       struct mmc_data data;
-
-       u8 *ext_csd;
-       struct scatterlist sg;
-
-       if (!host->card)
-               return;
-       if (mmc_card_dead(host->card))
-               return;
-       if (mmc_card_sd(host->card))
-               return;
-       if (host->card->csd.mmca_vsn < CSD_SPEC_VER_4)
-               return;
-
-       /*
-        * As the ext_csd is so large and mostly unused, we don't store the
-        * raw block in mmc_card.
-        */
-       ext_csd = kmalloc(512, GFP_KERNEL);
-       if (!ext_csd) {
-               printk("%s: could not allocate a buffer to receive the ext_csd."
-                      "mmc v4 cards will be treated as v3.\n",
-                       mmc_hostname(host));
-               return;
-       }
-
-       memset(&cmd, 0, sizeof(struct mmc_command));
-
-       cmd.opcode = MMC_SEND_EXT_CSD;
-       cmd.arg = 0;
-       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
-
-       memset(&data, 0, sizeof(struct mmc_data));
-
-       mmc_set_data_timeout(&data, host->card, 0);
-
-       data.blksz = 512;
-       data.blocks = 1;
-       data.flags = MMC_DATA_READ;
-       data.sg = &sg;
-       data.sg_len = 1;
-
-       memset(&mrq, 0, sizeof(struct mmc_request));
-
-       mrq.cmd = &cmd;
-       mrq.data = &data;
-
-       sg_init_one(&sg, ext_csd, 512);
-
-       mmc_wait_for_req(host, &mrq);
-
-       if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
-               if (host->card->csd.capacity == (4096 * 512)) {
-                       printk(KERN_ERR "%s: unable to read EXT_CSD "
-                               "on a possible high capacity card. "
-                               "Card will be ignored.\n",
-                               mmc_hostname(host));
-                       mmc_card_set_dead(host->card);
-               } else {
-                       printk(KERN_WARNING "%s: unable to read "
-                               "EXT_CSD, performance might "
-                               "suffer.\n",
-                               mmc_hostname(host));
-               }
-               goto out;
-       }
-
-       host->card->ext_csd.sectors =
-               ext_csd[EXT_CSD_SEC_CNT + 0] << 0 |
-               ext_csd[EXT_CSD_SEC_CNT + 1] << 8 |
-               ext_csd[EXT_CSD_SEC_CNT + 2] << 16 |
-               ext_csd[EXT_CSD_SEC_CNT + 3] << 24;
-       if (host->card->ext_csd.sectors)
-               mmc_card_set_blockaddr(host->card);
-
-       switch (ext_csd[EXT_CSD_CARD_TYPE]) {
-       case EXT_CSD_CARD_TYPE_52 | EXT_CSD_CARD_TYPE_26:
-               host->card->ext_csd.hs_max_dtr = 52000000;
-               break;
-       case EXT_CSD_CARD_TYPE_26:
-               host->card->ext_csd.hs_max_dtr = 26000000;
-               break;
-       default:
-               /* MMC v4 spec says this cannot happen */
-               printk("%s: card is mmc v4 but doesn't support "
-                      "any high-speed modes.\n",
-                       mmc_hostname(host));
-               goto out;
-       }
-
-       if (host->caps & MMC_CAP_MMC_HIGHSPEED) {
-               /* Activate highspeed support. */
-               cmd.opcode = MMC_SWITCH;
-               cmd.arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
-                         (EXT_CSD_HS_TIMING << 16) |
-                         (1 << 8) |
-                         EXT_CSD_CMD_SET_NORMAL;
-               cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
-
-               err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-               if (err != MMC_ERR_NONE) {
-                       printk("%s: failed to switch card to mmc v4 "
-                              "high-speed mode.\n",
-                              mmc_hostname(host));
-                       goto out;
-               }
-
-               mmc_card_set_highspeed(host->card);
-
-               host->ios.timing = MMC_TIMING_MMC_HS;
-               mmc_set_ios(host);
-       }
-
-       /* Check for host support for wide-bus modes. */
-       if (host->caps & MMC_CAP_4_BIT_DATA) {
-               /* Activate 4-bit support. */
-               cmd.opcode = MMC_SWITCH;
-               cmd.arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
-                         (EXT_CSD_BUS_WIDTH << 16) |
-                         (EXT_CSD_BUS_WIDTH_4 << 8) |
-                         EXT_CSD_CMD_SET_NORMAL;
-               cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
-
-               err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-               if (err != MMC_ERR_NONE) {
-                       printk("%s: failed to switch card to "
-                              "mmc v4 4-bit bus mode.\n",
-                              mmc_hostname(host));
-                       goto out;
-               }
-
-               host->ios.bus_width = MMC_BUS_WIDTH_4;
-               mmc_set_ios(host);
-       }
-
-out:
-       kfree(ext_csd);
-}
-
-static void mmc_read_scr(struct mmc_host *host)
-{
-       int err;
-       struct mmc_request mrq;
-       struct mmc_command cmd;
-       struct mmc_data data;
-       struct scatterlist sg;
-
-       if (!host->card)
-               return;
-       if (mmc_card_dead(host->card))
-               return;
-       if (!mmc_card_sd(host->card))
-               return;
-
-       memset(&cmd, 0, sizeof(struct mmc_command));
-
-       cmd.opcode = MMC_APP_CMD;
-       cmd.arg = host->card->rca << 16;
-       cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-       err = mmc_wait_for_cmd(host, &cmd, 0);
-       if ((err != MMC_ERR_NONE) || !(cmd.resp[0] & R1_APP_CMD)) {
-               mmc_card_set_dead(host->card);
-               return;
-       }
-
-       memset(&cmd, 0, sizeof(struct mmc_command));
-
-       cmd.opcode = SD_APP_SEND_SCR;
-       cmd.arg = 0;
-       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
-
-       memset(&data, 0, sizeof(struct mmc_data));
-
-       mmc_set_data_timeout(&data, host->card, 0);
-
-       data.blksz = 1 << 3;
-       data.blocks = 1;
-       data.flags = MMC_DATA_READ;
-       data.sg = &sg;
-       data.sg_len = 1;
-
-       memset(&mrq, 0, sizeof(struct mmc_request));
-
-       mrq.cmd = &cmd;
-       mrq.data = &data;
-
-       sg_init_one(&sg, (u8*)host->card->raw_scr, 8);
-
-       mmc_wait_for_req(host, &mrq);
-
-       if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
-               mmc_card_set_dead(host->card);
-               return;
-       }
-
-       host->card->raw_scr[0] = ntohl(host->card->raw_scr[0]);
-       host->card->raw_scr[1] = ntohl(host->card->raw_scr[1]);
-
-       mmc_decode_scr(host->card);
-}
-
-static void mmc_read_switch_caps(struct mmc_host *host)
-{
-       struct mmc_request mrq;
-       struct mmc_command cmd;
-       struct mmc_data data;
-       unsigned char *status;
-       struct scatterlist sg;
-
-       if (!(host->caps & MMC_CAP_SD_HIGHSPEED))
-               return;
-
-       if (!host->card)
-               return;
-       if (mmc_card_dead(host->card))
-               return;
-       if (!mmc_card_sd(host->card))
-               return;
-       if (host->card->scr.sda_vsn < SCR_SPEC_VER_1)
-               return;
-
-       status = kmalloc(64, GFP_KERNEL);
-       if (!status) {
-               printk(KERN_WARNING "%s: Unable to allocate buffer for "
-                       "reading switch capabilities.\n",
-                       mmc_hostname(host));
-               return;
-       }
-
-       memset(&cmd, 0, sizeof(struct mmc_command));
-
-       cmd.opcode = SD_SWITCH;
-       cmd.arg = 0x00FFFFF1;
-       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
-
-       memset(&data, 0, sizeof(struct mmc_data));
-
-       mmc_set_data_timeout(&data, host->card, 0);
-
-       data.blksz = 64;
-       data.blocks = 1;
-       data.flags = MMC_DATA_READ;
-       data.sg = &sg;
-       data.sg_len = 1;
-
-       memset(&mrq, 0, sizeof(struct mmc_request));
-
-       mrq.cmd = &cmd;
-       mrq.data = &data;
-
-       sg_init_one(&sg, status, 64);
-
-       mmc_wait_for_req(host, &mrq);
-
-       if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) {
-               printk("%s: unable to read switch capabilities, "
-                       "performance might suffer.\n",
-                       mmc_hostname(host));
-               goto out;
-       }
-
-       if (status[13] & 0x02)
-               host->card->sw_caps.hs_max_dtr = 50000000;
-
-       memset(&cmd, 0, sizeof(struct mmc_command));
-
-       cmd.opcode = SD_SWITCH;
-       cmd.arg = 0x80FFFFF1;
-       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
-
-       memset(&data, 0, sizeof(struct mmc_data));
-
-       mmc_set_data_timeout(&data, host->card, 0);
-
-       data.blksz = 64;
-       data.blocks = 1;
-       data.flags = MMC_DATA_READ;
-       data.sg = &sg;
-       data.sg_len = 1;
-
-       memset(&mrq, 0, sizeof(struct mmc_request));
-
-       mrq.cmd = &cmd;
-       mrq.data = &data;
-
-       sg_init_one(&sg, status, 64);
-
-       mmc_wait_for_req(host, &mrq);
-
-       if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE ||
-               (status[16] & 0xF) != 1) {
-               printk(KERN_WARNING "%s: Problem switching card "
-                       "into high-speed mode!\n",
-                       mmc_hostname(host));
-               goto out;
-       }
-
-       mmc_card_set_highspeed(host->card);
-
-       host->ios.timing = MMC_TIMING_SD_HS;
-       mmc_set_ios(host);
-
-out:
-       kfree(status);
-}
-
-static unsigned int mmc_calculate_clock(struct mmc_host *host)
-{
-       unsigned int max_dtr = host->f_max;
-
-       if (host->card && !mmc_card_dead(host->card)) {
-               if (mmc_card_highspeed(host->card) && mmc_card_sd(host->card)) {
-                       if (max_dtr > host->card->sw_caps.hs_max_dtr)
-                               max_dtr = host->card->sw_caps.hs_max_dtr;
-               } else if (mmc_card_highspeed(host->card) && !mmc_card_sd(host->card)) {
-                       if (max_dtr > host->card->ext_csd.hs_max_dtr)
-                               max_dtr = host->card->ext_csd.hs_max_dtr;
-               } else if (max_dtr > host->card->csd.max_dtr) {
-                       max_dtr = host->card->csd.max_dtr;
-               }
-       }
-
-       pr_debug("%s: selected %d.%03dMHz transfer rate\n",
-                mmc_hostname(host),
-                max_dtr / 1000000, (max_dtr / 1000) % 1000);
-
-       return max_dtr;
-}
-
-/*
- * Check whether cards we already know about are still present.
- * We do this by requesting status, and checking whether a card
- * responds.
- *
- * A request for status does not cause a state change in data
- * transfer mode.
- */
-static void mmc_check_card(struct mmc_card *card)
-{
-       struct mmc_command cmd;
-       int err;
-
-       BUG_ON(!card);
-
-       cmd.opcode = MMC_SEND_STATUS;
-       cmd.arg = card->rca << 16;
-       cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
-
-       err = mmc_wait_for_cmd(card->host, &cmd, CMD_RETRIES);
-       if (err == MMC_ERR_NONE)
-               return;
-
-       mmc_card_set_dead(card);
-}
-
-static void mmc_setup(struct mmc_host *host)
-{
-       int err;
-       u32 ocr;
-
-       host->mode = MMC_MODE_SD;
-
-       mmc_power_up(host);
-       mmc_idle_cards(host);
-
-       err = mmc_send_if_cond(host, host->ocr_avail, NULL);
-       if (err != MMC_ERR_NONE) {
-               return;
-       }
-       err = mmc_send_app_op_cond(host, 0, &ocr);
-
-       /*
-        * If we fail to detect any SD cards then try
-        * searching for MMC cards.
-        */
-       if (err != MMC_ERR_NONE) {
-               host->mode = MMC_MODE_MMC;
-
-               err = mmc_send_op_cond(host, 0, &ocr);
-               if (err != MMC_ERR_NONE)
-                       return;
-       }
-
-       host->ocr = mmc_select_voltage(host, ocr);
-
-       if (host->ocr == 0)
-               return;
-
-       /*
-        * Since we're changing the OCR value, we seem to
-        * need to tell some cards to go back to the idle
-        * state.  We wait 1ms to give cards time to
-        * respond.
-        */
-       mmc_idle_cards(host);
-
-       /*
-        * Send the selected OCR multiple times... until the cards
-        * all get the idea that they should be ready for CMD2.
-        * (My SanDisk card seems to need this.)
-        */
-       if (host->mode == MMC_MODE_SD) {
-               int err, sd2;
-               err = mmc_send_if_cond(host, host->ocr, &sd2);
-               if (err == MMC_ERR_NONE) {
-                       /*
-                       * If SD_SEND_IF_COND indicates an SD 2.0
-                       * compliant card and we should set bit 30
-                       * of the ocr to indicate that we can handle
-                       * block-addressed SDHC cards.
-                       */
-                       mmc_send_app_op_cond(host, host->ocr | (sd2 << 30), NULL);
-               }
-       } else {
-               /* The extra bit indicates that we support high capacity */
-               mmc_send_op_cond(host, host->ocr | (1 << 30), NULL);
-       }
-
-       mmc_discover_card(host);
-
-       /*
-        * Ok, now switch to push-pull mode.
-        */
-       host->ios.bus_mode = MMC_BUSMODE_PUSHPULL;
-       mmc_set_ios(host);
-
-       mmc_read_csd(host);
-
-       if (host->card && !mmc_card_dead(host->card)) {
-               err = mmc_select_card(host->card);
-               if (err != MMC_ERR_NONE)
-                       mmc_card_set_dead(host->card);
-       }
-
-       if (host->mode == MMC_MODE_SD) {
-               mmc_read_scr(host);
-               mmc_read_switch_caps(host);
-       } else
-               mmc_process_ext_csd(host);
-}
-
-
-/**
- *     mmc_detect_change - process change of state on a MMC socket
- *     @host: host which changed state.
- *     @delay: optional delay to wait before detection (jiffies)
- *
- *     All we know is that card(s) have been inserted or removed
- *     from the socket(s).  We don't know which socket or cards.
- */
-void mmc_detect_change(struct mmc_host *host, unsigned long delay)
-{
-#ifdef CONFIG_MMC_DEBUG
-       mmc_claim_host(host);
-       BUG_ON(host->removed);
-       mmc_release_host(host);
-#endif
-
-       mmc_schedule_delayed_work(&host->detect, delay);
-}
-
-EXPORT_SYMBOL(mmc_detect_change);
-
-
-static void mmc_rescan(struct work_struct *work)
-{
-       struct mmc_host *host =
-               container_of(work, struct mmc_host, detect.work);
-
-       mmc_claim_host(host);
-
-       /*
-        * Check for removed card and newly inserted ones. We check for
-        * removed cards first so we can intelligently re-select the VDD.
-        */
-       if (host->card) {
-               mmc_check_card(host->card);
-
-               mmc_release_host(host);
-
-               if (mmc_card_dead(host->card)) {
-                       mmc_remove_card(host->card);
-                       host->card = NULL;
-               }
-
-               goto out;
-       }
-
-       mmc_setup(host);
-
-       if (host->card && !mmc_card_dead(host->card)) {
-               /*
-                * (Re-)calculate the fastest clock rate which the
-                * attached cards and the host support.
-                */
-               host->ios.clock = mmc_calculate_clock(host);
-               mmc_set_ios(host);
-       }
-
-       mmc_release_host(host);
-
-       /*
-        * If this is a new and good card, register it.
-        */
-       if (host->card && !mmc_card_dead(host->card)) {
-               if (mmc_register_card(host->card))
-                       mmc_card_set_dead(host->card);
-       }
-
-       /*
-        * If this card is dead, destroy it.
-        */
-       if (host->card && mmc_card_dead(host->card)) {
-               mmc_remove_card(host->card);
-               host->card = NULL;
-       }
-
-out:
-       /*
-        * If we discover that there are no cards on the
-        * bus, turn off the clock and power down.
-        */
-       if (!host->card)
-               mmc_power_off(host);
-}
-
-
-/**
- *     mmc_alloc_host - initialise the per-host structure.
- *     @extra: sizeof private data structure
- *     @dev: pointer to host device model structure
- *
- *     Initialise the per-host structure.
- */
-struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
-{
-       struct mmc_host *host;
-
-       host = mmc_alloc_host_sysfs(extra, dev);
-       if (host) {
-               spin_lock_init(&host->lock);
-               init_waitqueue_head(&host->wq);
-               INIT_DELAYED_WORK(&host->detect, mmc_rescan);
-
-               /*
-                * By default, hosts do not support SGIO or large requests.
-                * They have to set these according to their abilities.
-                */
-               host->max_hw_segs = 1;
-               host->max_phys_segs = 1;
-               host->max_seg_size = PAGE_CACHE_SIZE;
-
-               host->max_req_size = PAGE_CACHE_SIZE;
-               host->max_blk_size = 512;
-               host->max_blk_count = PAGE_CACHE_SIZE / 512;
-       }
-
-       return host;
-}
-
-EXPORT_SYMBOL(mmc_alloc_host);
-
-/**
- *     mmc_add_host - initialise host hardware
- *     @host: mmc host
- */
-int mmc_add_host(struct mmc_host *host)
-{
-       int ret;
-
-       ret = mmc_add_host_sysfs(host);
-       if (ret == 0) {
-               mmc_power_off(host);
-               mmc_detect_change(host, 0);
-       }
-
-       return ret;
-}
-
-EXPORT_SYMBOL(mmc_add_host);
-
-/**
- *     mmc_remove_host - remove host hardware
- *     @host: mmc host
- *
- *     Unregister and remove all cards associated with this host,
- *     and power down the MMC bus.
- */
-void mmc_remove_host(struct mmc_host *host)
-{
-#ifdef CONFIG_MMC_DEBUG
-       mmc_claim_host(host);
-       host->removed = 1;
-       mmc_release_host(host);
-#endif
-
-       mmc_flush_scheduled_work();
-
-       if (host->card) {
-               mmc_remove_card(host->card);
-               host->card = NULL;
-       }
-
-       mmc_power_off(host);
-       mmc_remove_host_sysfs(host);
-}
-
-EXPORT_SYMBOL(mmc_remove_host);
-
-/**
- *     mmc_free_host - free the host structure
- *     @host: mmc host
- *
- *     Free the host once all references to it have been dropped.
- */
-void mmc_free_host(struct mmc_host *host)
-{
-       mmc_free_host_sysfs(host);
-}
-
-EXPORT_SYMBOL(mmc_free_host);
-
-#ifdef CONFIG_PM
-
-/**
- *     mmc_suspend_host - suspend a host
- *     @host: mmc host
- *     @state: suspend mode (PM_SUSPEND_xxx)
- */
-int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
-{
-       mmc_flush_scheduled_work();
-
-       if (host->card) {
-               mmc_remove_card(host->card);
-               host->card = NULL;
-       }
-
-       mmc_power_off(host);
-
-       return 0;
-}
-
-EXPORT_SYMBOL(mmc_suspend_host);
-
-/**
- *     mmc_resume_host - resume a previously suspended host
- *     @host: mmc host
- */
-int mmc_resume_host(struct mmc_host *host)
-{
-       mmc_rescan(&host->detect.work);
-
-       return 0;
-}
-
-EXPORT_SYMBOL(mmc_resume_host);
-
-#endif
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/mmc/mmc.h b/drivers/mmc/mmc.h
deleted file mode 100644 (file)
index 149affe..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  linux/drivers/mmc/mmc.h
- *
- *  Copyright (C) 2003 Russell King, All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef _MMC_H
-#define _MMC_H
-/* core-internal functions */
-void mmc_init_card(struct mmc_card *card, struct mmc_host *host);
-int mmc_register_card(struct mmc_card *card);
-void mmc_remove_card(struct mmc_card *card);
-
-struct mmc_host *mmc_alloc_host_sysfs(int extra, struct device *dev);
-int mmc_add_host_sysfs(struct mmc_host *host);
-void mmc_remove_host_sysfs(struct mmc_host *host);
-void mmc_free_host_sysfs(struct mmc_host *host);
-
-int mmc_schedule_work(struct work_struct *work);
-int mmc_schedule_delayed_work(struct delayed_work *work, unsigned long delay);
-void mmc_flush_scheduled_work(void);
-#endif
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
deleted file mode 100644 (file)
index 06f264b..0000000
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- *  linux/drivers/mmc/mmc_sysfs.c
- *
- *  Copyright (C) 2003 Russell King, All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *  MMC sysfs/driver model support.
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/idr.h>
-#include <linux/workqueue.h>
-
-#include <linux/mmc/card.h>
-#include <linux/mmc/host.h>
-
-#include "mmc.h"
-
-#define dev_to_mmc_card(d)     container_of(d, struct mmc_card, dev)
-#define to_mmc_driver(d)       container_of(d, struct mmc_driver, drv)
-#define cls_dev_to_mmc_host(d) container_of(d, struct mmc_host, class_dev)
-
-#define MMC_ATTR(name, fmt, args...)                                   \
-static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf)        \
-{                                                                      \
-       struct mmc_card *card = dev_to_mmc_card(dev);                   \
-       return sprintf(buf, fmt, args);                                 \
-}
-
-MMC_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
-       card->raw_cid[2], card->raw_cid[3]);
-MMC_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
-       card->raw_csd[2], card->raw_csd[3]);
-MMC_ATTR(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]);
-MMC_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year);
-MMC_ATTR(fwrev, "0x%x\n", card->cid.fwrev);
-MMC_ATTR(hwrev, "0x%x\n", card->cid.hwrev);
-MMC_ATTR(manfid, "0x%06x\n", card->cid.manfid);
-MMC_ATTR(name, "%s\n", card->cid.prod_name);
-MMC_ATTR(oemid, "0x%04x\n", card->cid.oemid);
-MMC_ATTR(serial, "0x%08x\n", card->cid.serial);
-
-#define MMC_ATTR_RO(name) __ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
-
-static struct device_attribute mmc_dev_attrs[] = {
-       MMC_ATTR_RO(cid),
-       MMC_ATTR_RO(csd),
-       MMC_ATTR_RO(date),
-       MMC_ATTR_RO(fwrev),
-       MMC_ATTR_RO(hwrev),
-       MMC_ATTR_RO(manfid),
-       MMC_ATTR_RO(name),
-       MMC_ATTR_RO(oemid),
-       MMC_ATTR_RO(serial),
-       __ATTR_NULL
-};
-
-static struct device_attribute mmc_dev_attr_scr = MMC_ATTR_RO(scr);
-
-
-static void mmc_release_card(struct device *dev)
-{
-       struct mmc_card *card = dev_to_mmc_card(dev);
-
-       kfree(card);
-}
-
-/*
- * This currently matches any MMC driver to any MMC card - drivers
- * themselves make the decision whether to drive this card in their
- * probe method.  However, we force "bad" cards to fail.
- */
-static int mmc_bus_match(struct device *dev, struct device_driver *drv)
-{
-       struct mmc_card *card = dev_to_mmc_card(dev);
-       return !mmc_card_bad(card);
-}
-
-static int
-mmc_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf,
-               int buf_size)
-{
-       struct mmc_card *card = dev_to_mmc_card(dev);
-       char ccc[13];
-       int retval = 0, i = 0, length = 0;
-
-#define add_env(fmt,val) do {                                  \
-       retval = add_uevent_var(envp, num_envp, &i,             \
-                               buf, buf_size, &length,         \
-                               fmt, val);                      \
-       if (retval)                                             \
-               return retval;                                  \
-} while (0);
-
-       for (i = 0; i < 12; i++)
-               ccc[i] = card->csd.cmdclass & (1 << i) ? '1' : '0';
-       ccc[12] = '\0';
-
-       add_env("MMC_CCC=%s", ccc);
-       add_env("MMC_MANFID=%06x", card->cid.manfid);
-       add_env("MMC_NAME=%s", mmc_card_name(card));
-       add_env("MMC_OEMID=%04x", card->cid.oemid);
-#undef add_env
-       envp[i] = NULL;
-
-       return 0;
-}
-
-static int mmc_bus_suspend(struct device *dev, pm_message_t state)
-{
-       struct mmc_driver *drv = to_mmc_driver(dev->driver);
-       struct mmc_card *card = dev_to_mmc_card(dev);
-       int ret = 0;
-
-       if (dev->driver && drv->suspend)
-               ret = drv->suspend(card, state);
-       return ret;
-}
-
-static int mmc_bus_resume(struct device *dev)
-{
-       struct mmc_driver *drv = to_mmc_driver(dev->driver);
-       struct mmc_card *card = dev_to_mmc_card(dev);
-       int ret = 0;
-
-       if (dev->driver && drv->resume)
-               ret = drv->resume(card);
-       return ret;
-}
-
-static int mmc_bus_probe(struct device *dev)
-{
-       struct mmc_driver *drv = to_mmc_driver(dev->driver);
-       struct mmc_card *card = dev_to_mmc_card(dev);
-
-       return drv->probe(card);
-}
-
-static int mmc_bus_remove(struct device *dev)
-{
-       struct mmc_driver *drv = to_mmc_driver(dev->driver);
-       struct mmc_card *card = dev_to_mmc_card(dev);
-
-       drv->remove(card);
-
-       return 0;
-}
-
-static struct bus_type mmc_bus_type = {
-       .name           = "mmc",
-       .dev_attrs      = mmc_dev_attrs,
-       .match          = mmc_bus_match,
-       .uevent         = mmc_bus_uevent,
-       .probe          = mmc_bus_probe,
-       .remove         = mmc_bus_remove,
-       .suspend        = mmc_bus_suspend,
-       .resume         = mmc_bus_resume,
-};
-
-/**
- *     mmc_register_driver - register a media driver
- *     @drv: MMC media driver
- */
-int mmc_register_driver(struct mmc_driver *drv)
-{
-       drv->drv.bus = &mmc_bus_type;
-       return driver_register(&drv->drv);
-}
-
-EXPORT_SYMBOL(mmc_register_driver);
-
-/**
- *     mmc_unregister_driver - unregister a media driver
- *     @drv: MMC media driver
- */
-void mmc_unregister_driver(struct mmc_driver *drv)
-{
-       drv->drv.bus = &mmc_bus_type;
-       driver_unregister(&drv->drv);
-}
-
-EXPORT_SYMBOL(mmc_unregister_driver);
-
-
-/*
- * Internal function.  Initialise a MMC card structure.
- */
-void mmc_init_card(struct mmc_card *card, struct mmc_host *host)
-{
-       memset(card, 0, sizeof(struct mmc_card));
-       card->host = host;
-       device_initialize(&card->dev);
-       card->dev.parent = mmc_classdev(host);
-       card->dev.bus = &mmc_bus_type;
-       card->dev.release = mmc_release_card;
-}
-
-/*
- * Internal function.  Register a new MMC card with the driver model.
- */
-int mmc_register_card(struct mmc_card *card)
-{
-       int ret;
-
-       snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),
-                "%s:%04x", mmc_hostname(card->host), card->rca);
-
-       ret = device_add(&card->dev);
-       if (ret == 0) {
-               if (mmc_card_sd(card)) {
-                       ret = device_create_file(&card->dev, &mmc_dev_attr_scr);
-                       if (ret)
-                               device_del(&card->dev);
-               }
-       }
-       if (ret == 0)
-               mmc_card_set_present(card);
-       return ret;
-}
-
-/*
- * Internal function.  Unregister a new MMC card with the
- * driver model, and (eventually) free it.
- */
-void mmc_remove_card(struct mmc_card *card)
-{
-       if (mmc_card_present(card)) {
-               if (mmc_card_sd(card))
-                       device_remove_file(&card->dev, &mmc_dev_attr_scr);
-
-               device_del(&card->dev);
-       }
-
-       put_device(&card->dev);
-}
-
-
-static void mmc_host_classdev_release(struct device *dev)
-{
-       struct mmc_host *host = cls_dev_to_mmc_host(dev);
-       kfree(host);
-}
-
-static struct class mmc_host_class = {
-       .name           = "mmc_host",
-       .dev_release    = mmc_host_classdev_release,
-};
-
-static DEFINE_IDR(mmc_host_idr);
-static DEFINE_SPINLOCK(mmc_host_lock);
-
-/*
- * Internal function. Allocate a new MMC host.
- */
-struct mmc_host *mmc_alloc_host_sysfs(int extra, struct device *dev)
-{
-       struct mmc_host *host;
-
-       host = kmalloc(sizeof(struct mmc_host) + extra, GFP_KERNEL);
-       if (host) {
-               memset(host, 0, sizeof(struct mmc_host) + extra);
-
-               host->parent = dev;
-               host->class_dev.parent = dev;
-               host->class_dev.class = &mmc_host_class;
-               device_initialize(&host->class_dev);
-       }
-
-       return host;
-}
-
-/*
- * Internal function. Register a new MMC host with the MMC class.
- */
-int mmc_add_host_sysfs(struct mmc_host *host)
-{
-       int err;
-
-       if (!idr_pre_get(&mmc_host_idr, GFP_KERNEL))
-               return -ENOMEM;
-
-       spin_lock(&mmc_host_lock);
-       err = idr_get_new(&mmc_host_idr, host, &host->index);
-       spin_unlock(&mmc_host_lock);
-       if (err)
-               return err;
-
-       snprintf(host->class_dev.bus_id, BUS_ID_SIZE,
-                "mmc%d", host->index);
-
-       return device_add(&host->class_dev);
-}
-
-/*
- * Internal function. Unregister a MMC host with the MMC class.
- */
-void mmc_remove_host_sysfs(struct mmc_host *host)
-{
-       device_del(&host->class_dev);
-
-       spin_lock(&mmc_host_lock);
-       idr_remove(&mmc_host_idr, host->index);
-       spin_unlock(&mmc_host_lock);
-}
-
-/*
- * Internal function. Free a MMC host.
- */
-void mmc_free_host_sysfs(struct mmc_host *host)
-{
-       put_device(&host->class_dev);
-}
-
-static struct workqueue_struct *workqueue;
-
-/*
- * Internal function. Schedule delayed work in the MMC work queue.
- */
-int mmc_schedule_delayed_work(struct delayed_work *work, unsigned long delay)
-{
-       return queue_delayed_work(workqueue, work, delay);
-}
-
-/*
- * Internal function. Flush all scheduled work from the MMC work queue.
- */
-void mmc_flush_scheduled_work(void)
-{
-       flush_workqueue(workqueue);
-}
-
-static int __init mmc_init(void)
-{
-       int ret;
-
-       workqueue = create_singlethread_workqueue("kmmcd");
-       if (!workqueue)
-               return -ENOMEM;
-
-       ret = bus_register(&mmc_bus_type);
-       if (ret == 0) {
-               ret = class_register(&mmc_host_class);
-               if (ret)
-                       bus_unregister(&mmc_bus_type);
-       }
-       return ret;
-}
-
-static void __exit mmc_exit(void)
-{
-       class_unregister(&mmc_host_class);
-       bus_unregister(&mmc_bus_type);
-       destroy_workqueue(workqueue);
-}
-
-module_init(mmc_init);
-module_exit(mmc_exit);
index 7d98990ac94e33fe8e2558c450fa0f585910eaeb..800425e051654bc4dc855244aad22392c80d318f 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef LINUX_MMC_CARD_H
 #define LINUX_MMC_CARD_H
 
-#include <linux/mmc/mmc.h>
+#include <linux/mmc/core.h>
 
 struct mmc_cid {
        unsigned int            manfid;
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
new file mode 100644 (file)
index 0000000..d8fd66c
--- /dev/null
@@ -0,0 +1,112 @@
+/*
+ *  linux/include/linux/mmc/core.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef LINUX_MMC_CORE_H
+#define LINUX_MMC_CORE_H
+
+#include <linux/interrupt.h>
+#include <linux/device.h>
+
+struct request;
+struct mmc_data;
+struct mmc_request;
+
+struct mmc_command {
+       u32                     opcode;
+       u32                     arg;
+       u32                     resp[4];
+       unsigned int            flags;          /* expected response type */
+#define MMC_RSP_PRESENT        (1 << 0)
+#define MMC_RSP_136    (1 << 1)                /* 136 bit response */
+#define MMC_RSP_CRC    (1 << 2)                /* expect valid crc */
+#define MMC_RSP_BUSY   (1 << 3)                /* card may send busy */
+#define MMC_RSP_OPCODE (1 << 4)                /* response contains opcode */
+#define MMC_CMD_MASK   (3 << 5)                /* command type */
+#define MMC_CMD_AC     (0 << 5)
+#define MMC_CMD_ADTC   (1 << 5)
+#define MMC_CMD_BC     (2 << 5)
+#define MMC_CMD_BCR    (3 << 5)
+
+/*
+ * These are the response types, and correspond to valid bit
+ * patterns of the above flags.  One additional valid pattern
+ * is all zeros, which means we don't expect a response.
+ */
+#define MMC_RSP_NONE   (0)
+#define MMC_RSP_R1     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
+#define MMC_RSP_R1B    (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)
+#define MMC_RSP_R2     (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)
+#define MMC_RSP_R3     (MMC_RSP_PRESENT)
+#define MMC_RSP_R6     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
+#define MMC_RSP_R7     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
+
+#define mmc_resp_type(cmd)     ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))
+
+/*
+ * These are the command types.
+ */
+#define mmc_cmd_type(cmd)      ((cmd)->flags & MMC_CMD_MASK)
+
+       unsigned int            retries;        /* max number of retries */
+       unsigned int            error;          /* command error */
+
+#define MMC_ERR_NONE   0
+#define MMC_ERR_TIMEOUT        1
+#define MMC_ERR_BADCRC 2
+#define MMC_ERR_FIFO   3
+#define MMC_ERR_FAILED 4
+#define MMC_ERR_INVALID        5
+
+       struct mmc_data         *data;          /* data segment associated with cmd */
+       struct mmc_request      *mrq;           /* associated request */
+};
+
+struct mmc_data {
+       unsigned int            timeout_ns;     /* data timeout (in ns, max 80ms) */
+       unsigned int            timeout_clks;   /* data timeout (in clocks) */
+       unsigned int            blksz;          /* data block size */
+       unsigned int            blocks;         /* number of blocks */
+       unsigned int            error;          /* data error */
+       unsigned int            flags;
+
+#define MMC_DATA_WRITE (1 << 8)
+#define MMC_DATA_READ  (1 << 9)
+#define MMC_DATA_STREAM        (1 << 10)
+#define MMC_DATA_MULTI (1 << 11)
+
+       unsigned int            bytes_xfered;
+
+       struct mmc_command      *stop;          /* stop command */
+       struct mmc_request      *mrq;           /* associated request */
+
+       unsigned int            sg_len;         /* size of scatter list */
+       struct scatterlist      *sg;            /* I/O scatter list */
+};
+
+struct mmc_request {
+       struct mmc_command      *cmd;
+       struct mmc_data         *data;
+       struct mmc_command      *stop;
+
+       void                    *done_data;     /* completion data */
+       void                    (*done)(struct mmc_request *);/* completion function */
+};
+
+struct mmc_host;
+struct mmc_card;
+
+extern int mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
+extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
+extern int mmc_wait_for_app_cmd(struct mmc_host *, unsigned int,
+       struct mmc_command *, int);
+
+extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *, int);
+
+extern void mmc_claim_host(struct mmc_host *host);
+extern void mmc_release_host(struct mmc_host *host);
+
+#endif
index 6ea3c0ea3e157ec54758e60783905578132adb51..43bf6a5c398d59e3b14ea2931e5afbb99ffb3809 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef LINUX_MMC_HOST_H
 #define LINUX_MMC_HOST_H
 
-#include <linux/mmc/mmc.h>
+#include <linux/mmc/core.h>
 
 struct mmc_ios {
        unsigned int    clock;                  /* clock rate */
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
deleted file mode 100644 (file)
index b3d80ef..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  linux/include/linux/mmc/mmc.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef MMC_H
-#define MMC_H
-
-#include <linux/interrupt.h>
-#include <linux/device.h>
-
-struct request;
-struct mmc_data;
-struct mmc_request;
-
-struct mmc_command {
-       u32                     opcode;
-       u32                     arg;
-       u32                     resp[4];
-       unsigned int            flags;          /* expected response type */
-#define MMC_RSP_PRESENT        (1 << 0)
-#define MMC_RSP_136    (1 << 1)                /* 136 bit response */
-#define MMC_RSP_CRC    (1 << 2)                /* expect valid crc */
-#define MMC_RSP_BUSY   (1 << 3)                /* card may send busy */
-#define MMC_RSP_OPCODE (1 << 4)                /* response contains opcode */
-#define MMC_CMD_MASK   (3 << 5)                /* command type */
-#define MMC_CMD_AC     (0 << 5)
-#define MMC_CMD_ADTC   (1 << 5)
-#define MMC_CMD_BC     (2 << 5)
-#define MMC_CMD_BCR    (3 << 5)
-
-/*
- * These are the response types, and correspond to valid bit
- * patterns of the above flags.  One additional valid pattern
- * is all zeros, which means we don't expect a response.
- */
-#define MMC_RSP_NONE   (0)
-#define MMC_RSP_R1     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
-#define MMC_RSP_R1B    (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)
-#define MMC_RSP_R2     (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)
-#define MMC_RSP_R3     (MMC_RSP_PRESENT)
-#define MMC_RSP_R6     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
-#define MMC_RSP_R7     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
-
-#define mmc_resp_type(cmd)     ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))
-
-/*
- * These are the command types.
- */
-#define mmc_cmd_type(cmd)      ((cmd)->flags & MMC_CMD_MASK)
-
-       unsigned int            retries;        /* max number of retries */
-       unsigned int            error;          /* command error */
-
-#define MMC_ERR_NONE   0
-#define MMC_ERR_TIMEOUT        1
-#define MMC_ERR_BADCRC 2
-#define MMC_ERR_FIFO   3
-#define MMC_ERR_FAILED 4
-#define MMC_ERR_INVALID        5
-
-       struct mmc_data         *data;          /* data segment associated with cmd */
-       struct mmc_request      *mrq;           /* associated request */
-};
-
-struct mmc_data {
-       unsigned int            timeout_ns;     /* data timeout (in ns, max 80ms) */
-       unsigned int            timeout_clks;   /* data timeout (in clocks) */
-       unsigned int            blksz;          /* data block size */
-       unsigned int            blocks;         /* number of blocks */
-       unsigned int            error;          /* data error */
-       unsigned int            flags;
-
-#define MMC_DATA_WRITE (1 << 8)
-#define MMC_DATA_READ  (1 << 9)
-#define MMC_DATA_STREAM        (1 << 10)
-#define MMC_DATA_MULTI (1 << 11)
-
-       unsigned int            bytes_xfered;
-
-       struct mmc_command      *stop;          /* stop command */
-       struct mmc_request      *mrq;           /* associated request */
-
-       unsigned int            sg_len;         /* size of scatter list */
-       struct scatterlist      *sg;            /* I/O scatter list */
-};
-
-struct mmc_request {
-       struct mmc_command      *cmd;
-       struct mmc_data         *data;
-       struct mmc_command      *stop;
-
-       void                    *done_data;     /* completion data */
-       void                    (*done)(struct mmc_request *);/* completion function */
-};
-
-struct mmc_host;
-struct mmc_card;
-
-extern int mmc_wait_for_req(struct mmc_host *, struct mmc_request *);
-extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
-extern int mmc_wait_for_app_cmd(struct mmc_host *, unsigned int,
-       struct mmc_command *, int);
-
-extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *, int);
-
-extern void mmc_claim_host(struct mmc_host *host);
-extern void mmc_release_host(struct mmc_host *host);
-
-#endif