1 files changed, 18 insertions, 12 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 93fe2e5dd616..e38d5a3b2a89 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -151,17 +151,19 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
 
         cmd.opcode = MMC_APP_CMD;
         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;
 
         err = mmc_wait_for_cmd(card->host, &cmd, 0);
-        if ((err != MMC_ERR_NONE) || !(cmd.resp[0] & R1_APP_CMD))
+        if (err)
+                return (u32)-1;
+        if (!mmc_host_is_spi(card->host) && !(cmd.resp[0] & R1_APP_CMD))
                 return (u32)-1;
 
         memset(&cmd, 0, sizeof(struct mmc_command));
 
         cmd.opcode = SD_APP_SEND_NUM_WR_BLKS;
         cmd.arg = 0;
-        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
 
         memset(&data, 0, sizeof(struct mmc_data));
 
@@ -192,7 +194,7 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
 
         mmc_wait_for_req(card->host, &mrq);
 
-        if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE)
+        if (cmd.error || data.error)
                 return (u32)-1;
 
         blocks = ntohl(blocks);
@@ -220,17 +222,15 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                 brq.cmd.arg = req->sector;
                 if (!mmc_card_blockaddr(card))
                         brq.cmd.arg <<= 9;
-                brq.cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+                brq.cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
                 brq.data.blksz = 1 << md->block_bits;
                 brq.stop.opcode = MMC_STOP_TRANSMISSION;
                 brq.stop.arg = 0;
-                brq.stop.flags = MMC_RSP_R1B | MMC_CMD_AC;
+                brq.stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
                 brq.data.blocks = req->nr_sectors >> (md->block_bits - 9);
                 if (brq.data.blocks > card->host->max_blk_count)
                         brq.data.blocks = card->host->max_blk_count;
 
-                mmc_set_data_timeout(&brq.data, card, rq_data_dir(req) != READ);
-
                 /*
                  * If the host doesn't support multiple block writes, force
                  * block writes to single block. SD cards are excepted from
@@ -243,8 +243,12 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                         brq.data.blocks = 1;
 
                 if (brq.data.blocks > 1) {
-                        brq.data.flags |= MMC_DATA_MULTI;
-                        brq.mrq.stop = &brq.stop;
+                        /* SPI multiblock writes terminate using a special
+                         * token, not a STOP_TRANSMISSION request.
+                         */
+                        if (!mmc_host_is_spi(card->host)
+                                        || rq_data_dir(req) == READ)
+                                brq.mrq.stop = &brq.stop;
                         readcmd = MMC_READ_MULTIPLE_BLOCK;
                         writecmd = MMC_WRITE_MULTIPLE_BLOCK;
                 } else {
@@ -261,6 +265,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                         brq.data.flags |= MMC_DATA_WRITE;
                 }
 
+                mmc_set_data_timeout(&brq.data, card);
+
                 brq.data.sg = mq->sg;
                 brq.data.sg_len = mmc_queue_map_sg(mq);
 
@@ -302,7 +308,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                         goto cmd_err;
                 }
 
-                if (rq_data_dir(req) != READ) {
+                if (!mmc_host_is_spi(card->host) && rq_data_dir(req) != READ) {
                         do {
                                 int err;
 
@@ -510,7 +516,7 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)
         mmc_claim_host(card->host);
         cmd.opcode = MMC_SET_BLOCKLEN;
         cmd.arg = 1 << md->block_bits;
-        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
         err = mmc_wait_for_cmd(card->host, &cmd, 5);
         mmc_release_host(card->host);