10 files changed, 372 insertions, 103 deletions

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 733ac95331c7..8d6f6014870f 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -243,10 +243,17 @@ int mmc_add_card(struct mmc_card *card)
                 break;
         }
 
-        printk(KERN_INFO "%s: new %s%s card at address %04x\n",
-                mmc_hostname(card->host),
-                mmc_card_highspeed(card) ? "high speed " : "",
-                type, card->rca);
+        if (mmc_host_is_spi(card->host)) {
+                printk(KERN_INFO "%s: new %s%s card on SPI\n",
+                        mmc_hostname(card->host),
+                        mmc_card_highspeed(card) ? "high speed " : "",
+                        type);
+        } else {
+                printk(KERN_INFO "%s: new %s%s card at address %04x\n",
+                        mmc_hostname(card->host),
+                        mmc_card_highspeed(card) ? "high speed " : "",
+                        type, card->rca);
+        }
 
         card->dev.uevent_suppress = 1;
 
@@ -278,8 +285,13 @@ int mmc_add_card(struct mmc_card *card)
 void mmc_remove_card(struct mmc_card *card)
 {
         if (mmc_card_present(card)) {
-                printk(KERN_INFO "%s: card %04x removed\n",
-                        mmc_hostname(card->host), card->rca);
+                if (mmc_host_is_spi(card->host)) {
+                        printk(KERN_INFO "%s: SPI card removed\n",
+                                mmc_hostname(card->host));
+                } else {
+                        printk(KERN_INFO "%s: card %04x removed\n",
+                                mmc_hostname(card->host), card->rca);
+                }
 
                 if (card->host->bus_ops->sysfs_remove)
                         card->host->bus_ops->sysfs_remove(card->host, card);
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index bffcaf8df352..bad39442f8fe 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -42,6 +42,14 @@ extern int mmc_attach_sdio(struct mmc_host *host, u32 ocr);
 static struct workqueue_struct *workqueue;
 
 /*
+ * Enabling software CRCs on the data blocks can be a significant (30%)
+ * performance cost, and for other reasons may not always be desired.
+ * So we allow it it to be disabled.
+ */
+int use_spi_crc = 1;
+module_param(use_spi_crc, bool, 0);
+
+/*
  * Internal function. Schedule delayed work in the MMC work queue.
  */
 static int mmc_schedule_delayed_work(struct delayed_work *work,
@@ -71,6 +79,11 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
         struct mmc_command *cmd = mrq->cmd;
         int err = cmd->error;
 
+        if (err && cmd->retries && mmc_host_is_spi(host)) {
+                if (cmd->resp[0] & R1_SPI_ILLEGAL_COMMAND)
+                        cmd->retries = 0;
+        }
+
         if (err && cmd->retries) {
                 pr_debug("%s: req failed (CMD%u): %d, retrying...\n",
                         mmc_hostname(host), cmd->opcode, err);
@@ -453,8 +466,13 @@ 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;
+        if (mmc_host_is_spi(host)) {
+                host->ios.chip_select = MMC_CS_HIGH;
+                host->ios.bus_mode = MMC_BUSMODE_PUSHPULL;
+        } else {
+                host->ios.chip_select = MMC_CS_DONTCARE;
+                host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+        }
         host->ios.power_mode = MMC_POWER_UP;
         host->ios.bus_width = MMC_BUS_WIDTH_1;
         host->ios.timing = MMC_TIMING_LEGACY;
@@ -481,8 +499,10 @@ 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;
+        if (!mmc_host_is_spi(host)) {
+                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;
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index bb2774af9ea9..39daf2fb5dc4 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -48,5 +48,7 @@ void mmc_rescan(struct work_struct *work);
 void mmc_start_host(struct mmc_host *host);
 void mmc_stop_host(struct mmc_host *host);
 
+extern int use_spi_crc;
+
 #endif
 
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 6ba458951d24..65fe28860f54 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -165,8 +165,6 @@ static int mmc_read_ext_csd(struct mmc_card *card)
 
         BUG_ON(!card);
 
-        err = -EIO;
-
         if (card->csd.mmca_vsn < CSD_SPEC_VER_4)
                 return 0;
 
@@ -280,9 +278,21 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                 goto err;
 
         /*
+         * For SPI, enable CRC as appropriate.
+         */
+        if (mmc_host_is_spi(host)) {
+                err = mmc_spi_set_crc(host, use_spi_crc);
+                if (err)
+                        goto err;
+        }
+
+        /*
          * Fetch CID from card.
          */
-        err = mmc_all_send_cid(host, cid);
+        if (mmc_host_is_spi(host))
+                err = mmc_send_cid(host, cid);
+        else
+                err = mmc_all_send_cid(host, cid);
         if (err)
                 goto err;
 
@@ -309,13 +319,15 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         }
 
         /*
-         * Set card RCA.
+         * For native busses:  set card RCA and quit open drain mode.
          */
-        err = mmc_set_relative_addr(card);
-        if (err)
-                goto free_card;
+        if (!mmc_host_is_spi(host)) {
+                err = mmc_set_relative_addr(card);
+                if (err)
+                        goto free_card;
 
-        mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+                mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+        }
 
         if (!oldcard) {
                 /*
@@ -336,13 +348,15 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         /*
          * Select card, as all following commands rely on that.
          */
-        err = mmc_select_card(card);
-        if (err)
-                goto free_card;
+        if (!mmc_host_is_spi(host)) {
+                err = mmc_select_card(card);
+                if (err)
+                        goto free_card;
+        }
 
         if (!oldcard) {
                 /*
-                 * Fetch and process extened CSD.
+                 * Fetch and process extended CSD.
                  */
                 err = mmc_read_ext_csd(card);
                 if (err)
@@ -502,7 +516,8 @@ static void mmc_suspend(struct mmc_host *host)
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
-        mmc_deselect_cards(host);
+        if (!mmc_host_is_spi(host))
+                mmc_deselect_cards(host);
         host->card->state &= ~MMC_STATE_HIGHSPEED;
         mmc_release_host(host);
 }
@@ -563,6 +578,15 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr)
         mmc_attach_bus(host, &mmc_ops);
 
         /*
+         * We need to get OCR a different way for SPI.
+         */
+        if (mmc_host_is_spi(host)) {
+                err = mmc_spi_read_ocr(host, 1, &ocr);
+                if (err)
+                        goto err;
+        }
+
+        /*
          * Sanity check the voltages that the card claims to
          * support.
          */
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 39567f91a4b8..bf4bc6adcfef 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -63,23 +63,36 @@ int mmc_go_idle(struct mmc_host *host)
         int err;
         struct mmc_command cmd;
 
-        mmc_set_chip_select(host, MMC_CS_HIGH);
-
-        mmc_delay(1);
+        /*
+         * Non-SPI hosts need to prevent chipselect going active during
+         * GO_IDLE; that would put chips into SPI mode.  Remind them of
+         * that in case of hardware that won't pull up DAT3/nCS otherwise.
+         *
+         * SPI hosts ignore ios.chip_select; it's managed according to
+         * rules that must accomodate non-MMC slaves which this layer
+         * won't even know about.
+         */
+        if (!mmc_host_is_spi(host)) {
+                mmc_set_chip_select(host, MMC_CS_HIGH);
+                mmc_delay(1);
+        }
 
         memset(&cmd, 0, sizeof(struct mmc_command));
 
         cmd.opcode = MMC_GO_IDLE_STATE;
         cmd.arg = 0;
-        cmd.flags = MMC_RSP_NONE | MMC_CMD_BC;
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_NONE | MMC_CMD_BC;
 
         err = mmc_wait_for_cmd(host, &cmd, 0);
 
         mmc_delay(1);
 
-        mmc_set_chip_select(host, MMC_CS_DONTCARE);
+        if (!mmc_host_is_spi(host)) {
+                mmc_set_chip_select(host, MMC_CS_DONTCARE);
+                mmc_delay(1);
+        }
 
-        mmc_delay(1);
+        host->use_spi_crc = 0;
 
         return err;
 }
@@ -94,23 +107,33 @@ int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
         memset(&cmd, 0, sizeof(struct mmc_command));
 
         cmd.opcode = MMC_SEND_OP_COND;
-        cmd.arg = ocr;
-        cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
+        cmd.arg = mmc_host_is_spi(host) ? 0 : ocr;
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R3 | MMC_CMD_BCR;
 
         for (i = 100; i; i--) {
                 err = mmc_wait_for_cmd(host, &cmd, 0);
                 if (err)
                         break;
 
-                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                /* if we're just probing, do a single pass */
+                if (ocr == 0)
                         break;
 
+                /* otherwise wait until reset completes */
+                if (mmc_host_is_spi(host)) {
+                        if (!(cmd.resp[0] & R1_SPI_IDLE))
+                                break;
+                } else {
+                        if (cmd.resp[0] & MMC_CARD_BUSY)
+                                break;
+                }
+
                 err = -ETIMEDOUT;
 
                 mmc_delay(10);
         }
 
-        if (rocr)
+        if (rocr && !mmc_host_is_spi(host))
                 *rocr = cmd.resp[0];
 
         return err;
@@ -160,40 +183,46 @@ int mmc_set_relative_addr(struct mmc_card *card)
         return 0;
 }
 
-int mmc_send_csd(struct mmc_card *card, u32 *csd)
+static int
+mmc_send_cxd_native(struct mmc_host *host, u32 arg, u32 *cxd, int opcode)
 {
         int err;
         struct mmc_command cmd;
 
-        BUG_ON(!card);
-        BUG_ON(!card->host);
-        BUG_ON(!csd);
+        BUG_ON(!host);
+        BUG_ON(!cxd);
 
         memset(&cmd, 0, sizeof(struct mmc_command));
 
-        cmd.opcode = MMC_SEND_CSD;
-        cmd.arg = card->rca << 16;
+        cmd.opcode = opcode;
+        cmd.arg = arg;
         cmd.flags = MMC_RSP_R2 | MMC_CMD_AC;
 
-        err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
+        err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
         if (err)
                 return err;
 
-        memcpy(csd, cmd.resp, sizeof(u32) * 4);
+        memcpy(cxd, cmd.resp, sizeof(u32) * 4);
 
         return 0;
 }
 
-int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd)
+static int
+mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
+                u32 opcode, void *buf, unsigned len)
 {
         struct mmc_request mrq;
         struct mmc_command cmd;
         struct mmc_data data;
         struct scatterlist sg;
+        void *data_buf;
 
-        BUG_ON(!card);
-        BUG_ON(!card->host);
-        BUG_ON(!ext_csd);
+        /* dma onto stack is unsafe/nonportable, but callers to this
+         * routine normally provide temporary on-stack buffers ...
+         */
+        data_buf = kmalloc(len, GFP_KERNEL);
+        if (data_buf == NULL)
+                return -ENOMEM;
 
         memset(&mrq, 0, sizeof(struct mmc_request));
         memset(&cmd, 0, sizeof(struct mmc_command));
@@ -202,21 +231,31 @@ int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd)
         mrq.cmd = &cmd;
         mrq.data = &data;
 
-        cmd.opcode = MMC_SEND_EXT_CSD;
+        cmd.opcode = opcode;
         cmd.arg = 0;
-        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
 
-        data.blksz = 512;
+        /* NOTE HACK:  the MMC_RSP_SPI_R1 is always correct here, but we
+         * rely on callers to never use this with "native" calls for reading
+         * CSD or CID.  Native versions of those commands use the R2 type,
+         * not R1 plus a data block.
+         */
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
+
+        data.blksz = len;
         data.blocks = 1;
         data.flags = MMC_DATA_READ;
         data.sg = &sg;
         data.sg_len = 1;
 
-        sg_init_one(&sg, ext_csd, 512);
+        sg_init_one(&sg, data_buf, len);
 
-        mmc_set_data_timeout(&data, card);
+        if (card)
+                mmc_set_data_timeout(&data, card);
 
-        mmc_wait_for_req(card->host, &mrq);
+        mmc_wait_for_req(host, &mrq);
+
+        memcpy(buf, data_buf, len);
+        kfree(data_buf);
 
         if (cmd.error)
                 return cmd.error;
@@ -226,6 +265,67 @@ int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd)
         return 0;
 }
 
+int mmc_send_csd(struct mmc_card *card, u32 *csd)
+{
+        if (!mmc_host_is_spi(card->host))
+                return mmc_send_cxd_native(card->host, card->rca << 16,
+                                csd, MMC_SEND_CSD);
+
+        return mmc_send_cxd_data(card, card->host, MMC_SEND_CSD, csd, 16);
+}
+
+int mmc_send_cid(struct mmc_host *host, u32 *cid)
+{
+        if (!mmc_host_is_spi(host)) {
+                if (!host->card)
+                        return -EINVAL;
+                return mmc_send_cxd_native(host, host->card->rca << 16,
+                                cid, MMC_SEND_CID);
+        }
+
+        return mmc_send_cxd_data(NULL, host, MMC_SEND_CID, cid, 16);
+}
+
+int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd)
+{
+        return mmc_send_cxd_data(card, card->host, MMC_SEND_EXT_CSD,
+                        ext_csd, 512);
+}
+
+int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp)
+{
+        struct mmc_command cmd;
+        int err;
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SPI_READ_OCR;
+        cmd.arg = highcap ? (1 << 30) : 0;
+        cmd.flags = MMC_RSP_SPI_R3;
+
+        err = mmc_wait_for_cmd(host, &cmd, 0);
+
+        *ocrp = cmd.resp[1];
+        return err;
+}
+
+int mmc_spi_set_crc(struct mmc_host *host, int use_crc)
+{
+        struct mmc_command cmd;
+        int err;
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+
+        cmd.opcode = MMC_SPI_CRC_ON_OFF;
+        cmd.flags = MMC_RSP_SPI_R1;
+        cmd.arg = use_crc;
+
+        err = mmc_wait_for_cmd(host, &cmd, 0);
+        if (!err)
+                host->use_spi_crc = use_crc;
+        return err;
+}
+
 int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
 {
         int err;
@@ -241,7 +341,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value)
                   (index << 16) |
                   (value << 8) |
                   set;
-        cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+        cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
 
         err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
         if (err)
@@ -261,13 +361,17 @@ int mmc_send_status(struct mmc_card *card, u32 *status)
         memset(&cmd, 0, sizeof(struct mmc_command));
 
         cmd.opcode = MMC_SEND_STATUS;
-        cmd.arg = card->rca << 16;
-        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+        if (!mmc_host_is_spi(card->host))
+                cmd.arg = card->rca << 16;
+        cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC;
 
         err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
         if (err)
                 return err;
 
+        /* NOTE: callers are required to understand the difference
+         * between "native" and SPI format status words!
+         */
         if (status)
                 *status = cmd.resp[0];
 
diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h
index 76d09a93c5d6..17854bf7cf0d 100644
--- a/drivers/mmc/core/mmc_ops.h
+++ b/drivers/mmc/core/mmc_ops.h
@@ -22,6 +22,9 @@ int mmc_send_csd(struct mmc_card *card, u32 *csd);
 int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd);
 int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value);
 int mmc_send_status(struct mmc_card *card, u32 *status);
+int mmc_send_cid(struct mmc_host *host, u32 *cid);
+int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp);
+int mmc_spi_set_crc(struct mmc_host *host, int use_crc);
 
 #endif
 
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index c86588fdaae5..d1c1e0f592f1 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -323,9 +323,21 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
                 goto err;
 
         /*
+         * For SPI, enable CRC as appropriate.
+         */
+        if (mmc_host_is_spi(host)) {
+                err = mmc_spi_set_crc(host, use_spi_crc);
+                if (err)
+                        goto err;
+        }
+
+        /*
          * Fetch CID from card.
          */
-        err = mmc_all_send_cid(host, cid);
+        if (mmc_host_is_spi(host))
+                err = mmc_send_cid(host, cid);
+        else
+                err = mmc_all_send_cid(host, cid);
         if (err)
                 goto err;
 
@@ -351,13 +363,15 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
         }
 
         /*
-         * Set card RCA.
+         * For native busses:  get card RCA and quit open drain mode.
          */
-        err = mmc_send_relative_addr(host, &card->rca);
-        if (err)
-                goto free_card;
+        if (!mmc_host_is_spi(host)) {
+                err = mmc_send_relative_addr(host, &card->rca);
+                if (err)
+                        goto free_card;
 
-        mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+                mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+        }
 
         if (!oldcard) {
                 /*
@@ -377,9 +391,11 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
         /*
          * Select card, as all following commands rely on that.
          */
-        err = mmc_select_card(card);
-        if (err)
-                goto free_card;
+        if (!mmc_host_is_spi(host)) {
+                err = mmc_select_card(card);
+                if (err)
+                        goto free_card;
+        }
 
         if (!oldcard) {
                 /*
@@ -562,7 +578,8 @@ static void mmc_sd_suspend(struct mmc_host *host)
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
-        mmc_deselect_cards(host);
+        if (!mmc_host_is_spi(host))
+                mmc_deselect_cards(host);
         host->card->state &= ~MMC_STATE_HIGHSPEED;
         mmc_release_host(host);
 }
@@ -623,6 +640,17 @@ int mmc_attach_sd(struct mmc_host *host, u32 ocr)
         mmc_attach_bus(host, &mmc_sd_ops);
 
         /*
+         * We need to get OCR a different way for SPI.
+         */
+        if (mmc_host_is_spi(host)) {
+                mmc_go_idle(host);
+
+                err = mmc_spi_read_ocr(host, 0, &ocr);
+                if (err)
+                        goto err;
+        }
+
+        /*
          * Sanity check the voltages that the card claims to
          * support.
          */
diff --git a/drivers/mmc/core/sd_ops.c b/drivers/mmc/core/sd_ops.c
index 491e0306b1b4..ee4029a24efd 100644
--- a/drivers/mmc/core/sd_ops.c
+++ b/drivers/mmc/core/sd_ops.c
@@ -33,10 +33,10 @@ static int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card)
 
         if (card) {
                 cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+                cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
         } else {
                 cmd.arg = 0;
-                cmd.flags = MMC_RSP_R1 | MMC_CMD_BCR;
+                cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_BCR;
         }
 
         err = mmc_wait_for_cmd(host, &cmd, 0);
@@ -44,7 +44,7 @@ static int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card)
                 return err;
 
         /* Check that card supported application commands */
-        if (!(cmd.resp[0] & R1_APP_CMD))
+        if (!mmc_host_is_spi(host) && !(cmd.resp[0] & R1_APP_CMD))
                 return -EOPNOTSUPP;
 
         return 0;
@@ -83,8 +83,14 @@ int mmc_wait_for_app_cmd(struct mmc_host *host, struct mmc_card *card,
                 memset(&mrq, 0, sizeof(struct mmc_request));
 
                 err = mmc_app_cmd(host, card);
-                if (err)
+                if (err) {
+                        /* no point in retrying; no APP commands allowed */
+                        if (mmc_host_is_spi(host)) {
+                                if (cmd->resp[0] & R1_SPI_ILLEGAL_COMMAND)
+                                        break;
+                        }
                         continue;
+                }
 
                 memset(&mrq, 0, sizeof(struct mmc_request));
 
@@ -99,6 +105,12 @@ int mmc_wait_for_app_cmd(struct mmc_host *host, struct mmc_card *card,
                 err = cmd->error;
                 if (!cmd->error)
                         break;
+
+                /* no point in retrying illegal APP commands */
+                if (mmc_host_is_spi(host)) {
+                        if (cmd->resp[0] & R1_SPI_ILLEGAL_COMMAND)
+                                break;
+                }
         }
 
         return err;
@@ -147,23 +159,36 @@ int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
         memset(&cmd, 0, sizeof(struct mmc_command));
 
         cmd.opcode = SD_APP_OP_COND;
-        cmd.arg = ocr;
-        cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
+        if (mmc_host_is_spi(host))
+                cmd.arg = ocr & (1 << 30); /* SPI only defines one bit */
+        else
+                cmd.arg = ocr;
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R3 | MMC_CMD_BCR;
 
         for (i = 100; i; i--) {
                 err = mmc_wait_for_app_cmd(host, NULL, &cmd, MMC_CMD_RETRIES);
                 if (err)
                         break;
 
-                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                /* if we're just probing, do a single pass */
+                if (ocr == 0)
                         break;
 
+                /* otherwise wait until reset completes */
+                if (mmc_host_is_spi(host)) {
+                        if (!(cmd.resp[0] & R1_SPI_IDLE))
+                                break;
+                } else {
+                        if (cmd.resp[0] & MMC_CARD_BUSY)
+                                break;
+                }
+
                 err = -ETIMEDOUT;
 
                 mmc_delay(10);
         }
 
-        if (rocr)
+        if (rocr && !mmc_host_is_spi(host))
                 *rocr = cmd.resp[0];
 
         return err;
@@ -174,6 +199,7 @@ int mmc_send_if_cond(struct mmc_host *host, u32 ocr)
         struct mmc_command cmd;
         int err;
         static const u8 test_pattern = 0xAA;
+        u8 result_pattern;
 
         /*
          * To support SD 2.0 cards, we must always invoke SD_SEND_IF_COND
@@ -182,13 +208,18 @@ int mmc_send_if_cond(struct mmc_host *host, u32 ocr)
          */
         cmd.opcode = SD_SEND_IF_COND;
         cmd.arg = ((ocr & 0xFF8000) != 0) << 8 | test_pattern;
-        cmd.flags = MMC_RSP_R7 | MMC_CMD_BCR;
+        cmd.flags = MMC_RSP_SPI_R7 | MMC_RSP_R7 | MMC_CMD_BCR;
 
         err = mmc_wait_for_cmd(host, &cmd, 0);
         if (err)
                 return err;
 
-        if ((cmd.resp[0] & 0xFF) != test_pattern)
+        if (mmc_host_is_spi(host))
+                result_pattern = cmd.resp[1] & 0xFF;
+        else
+                result_pattern = cmd.resp[0] & 0xFF;
+
+        if (result_pattern != test_pattern)
                 return -EIO;
 
         return 0;
@@ -229,6 +260,8 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
         BUG_ON(!card->host);
         BUG_ON(!scr);
 
+        /* NOTE: caller guarantees scr is heap-allocated */
+
         err = mmc_app_cmd(card->host, card);
         if (err)
                 return err;
@@ -242,7 +275,7 @@ int mmc_app_send_scr(struct mmc_card *card, u32 *scr)
 
         cmd.opcode = SD_APP_SEND_SCR;
         cmd.arg = 0;
-        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
 
         data.blksz = 8;
         data.blocks = 1;
@@ -278,6 +311,8 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group,
         BUG_ON(!card);
         BUG_ON(!card->host);
 
+        /* NOTE: caller guarantees resp is heap-allocated */
+
         mode = !!mode;
         value &= 0xF;
 
@@ -292,7 +327,7 @@ int mmc_sd_switch(struct mmc_card *card, int mode, int group,
         cmd.arg = mode << 31 | 0x00FFFFFF;
         cmd.arg &= ~(0xF << (group * 4));
         cmd.arg |= value << (group * 4);
-        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
 
         data.blksz = 64;
         data.blocks = 1;
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 2f3fb994c383..87a50f456efc 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -270,6 +270,15 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
                 goto err;
 
         /*
+         * For SPI, enable CRC as appropriate.
+         */
+        if (mmc_host_is_spi(host)) {
+                err = mmc_spi_set_crc(host, use_spi_crc);
+                if (err)
+                        goto err;
+        }
+
+        /*
          * The number of functions on the card is encoded inside
          * the ocr.
          */
@@ -290,20 +299,24 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
         host->card = card;
 
         /*
-         * Set card RCA.
+         * For native busses:  set card RCA and quit open drain mode.
          */
-        err = mmc_send_relative_addr(host, &card->rca);
-        if (err)
-                goto remove;
+        if (!mmc_host_is_spi(host)) {
+                err = mmc_send_relative_addr(host, &card->rca);
+                if (err)
+                        goto remove;
 
-        mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+                mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+        }
 
         /*
          * Select card, as all following commands rely on that.
          */
-        err = mmc_select_card(card);
-        if (err)
-                goto remove;
+        if (!mmc_host_is_spi(host)) {
+                err = mmc_select_card(card);
+                if (err)
+                        goto remove;
+        }
 
         /*
          * Read the common registers.
diff --git a/drivers/mmc/core/sdio_ops.c b/drivers/mmc/core/sdio_ops.c
index 98e20532452a..4d289b275031 100644
--- a/drivers/mmc/core/sdio_ops.c
+++ b/drivers/mmc/core/sdio_ops.c
@@ -30,23 +30,39 @@ int mmc_send_io_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
 
         cmd.opcode = SD_IO_SEND_OP_COND;
         cmd.arg = ocr;
-        cmd.flags = MMC_RSP_R4 | MMC_CMD_BCR;
+        cmd.flags = MMC_RSP_SPI_R4 | MMC_RSP_R4 | MMC_CMD_BCR;
 
         for (i = 100; i; i--) {
                 err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
                 if (err)
                         break;
 
-                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                /* if we're just probing, do a single pass */
+                if (ocr == 0)
                         break;
 
+                /* otherwise wait until reset completes */
+                if (mmc_host_is_spi(host)) {
+                        /*
+                         * Both R1_SPI_IDLE and MMC_CARD_BUSY indicate
+                         * an initialized card under SPI, but some cards
+                         * (Marvell's) only behave when looking at this
+                         * one.
+                         */
+                        if (cmd.resp[1] & MMC_CARD_BUSY)
+                                break;
+                } else {
+                        if (cmd.resp[0] & MMC_CARD_BUSY)
+                                break;
+                }
+
                 err = -ETIMEDOUT;
 
                 mmc_delay(10);
         }
 
         if (rocr)
-                *rocr = cmd.resp[0];
+                *rocr = cmd.resp[mmc_host_is_spi(host) ? 1 : 0];
 
         return err;
 }
@@ -68,21 +84,29 @@ int mmc_io_rw_direct(struct mmc_card *card, int write, unsigned fn,
         cmd.arg |= (write && out) ? 0x08000000 : 0x00000000;
         cmd.arg |= addr << 9;
         cmd.arg |= in;
-        cmd.flags = MMC_RSP_R5 | MMC_CMD_AC;
+        cmd.flags = MMC_RSP_SPI_R5 | MMC_RSP_R5 | MMC_CMD_AC;
 
         err = mmc_wait_for_cmd(card->host, &cmd, 0);
         if (err)
                 return err;
 
-        if (cmd.resp[0] & R5_ERROR)
-                return -EIO;
-        if (cmd.resp[0] & R5_FUNCTION_NUMBER)
-                return -EINVAL;
-        if (cmd.resp[0] & R5_OUT_OF_RANGE)
-                return -ERANGE;
+        if (mmc_host_is_spi(card->host)) {
+                /* host driver already reported errors */
+        } else {
+                if (cmd.resp[0] & R5_ERROR)
+                        return -EIO;
+                if (cmd.resp[0] & R5_FUNCTION_NUMBER)
+                        return -EINVAL;
+                if (cmd.resp[0] & R5_OUT_OF_RANGE)
+                        return -ERANGE;
+        }
 
-        if (out)
-                *out = cmd.resp[0] & 0xFF;
+        if (out) {
+                if (mmc_host_is_spi(card->host))
+                        *out = (cmd.resp[0] >> 8) & 0xFF;
+                else
+                        *out = cmd.resp[0] & 0xFF;
+        }
 
         return 0;
 }
@@ -117,7 +141,7 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn,
                 cmd.arg |= (blksz == 512) ? 0 : blksz;  /* byte mode */
         else
                 cmd.arg |= 0x08000000 | blocks;         /* block mode */
-        cmd.flags = MMC_RSP_R5 | MMC_CMD_ADTC;
+        cmd.flags = MMC_RSP_SPI_R5 | MMC_RSP_R5 | MMC_CMD_ADTC;
 
         data.blksz = blksz;
         data.blocks = blocks;
@@ -136,12 +160,16 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn,
         if (data.error)
                 return data.error;
 
-        if (cmd.resp[0] & R5_ERROR)
-                return -EIO;
-        if (cmd.resp[0] & R5_FUNCTION_NUMBER)
-                return -EINVAL;
-        if (cmd.resp[0] & R5_OUT_OF_RANGE)
-                return -ERANGE;
+        if (mmc_host_is_spi(card->host)) {
+                /* host driver already reported errors */
+        } else {
+                if (cmd.resp[0] & R5_ERROR)
+                        return -EIO;
+                if (cmd.resp[0] & R5_FUNCTION_NUMBER)
+                        return -EINVAL;
+                if (cmd.resp[0] & R5_OUT_OF_RANGE)
+                        return -ERANGE;
+        }
 
         return 0;
 }