MMC core learns about SPI

Teach the MMC/SD/SDIO core about using SPI mode.

 - Use mmc_host_is_spi() so enumeration works through SPI signaling
   and protocols, not just the native versions.

 - Provide the SPI response type flags with each request issued,
   including requests from the new lock/unlock code.

 - Understand that cmd->resp[0] and mmc_get_status() results for SPI
   return different values than for "native" MMC/SD protocol; this
   affects resetting, checking card lock status, and some others.

 - Understand that some commands act a bit differently ... notably:
     * OP_COND command doesn't return the OCR
     * APP_CMD status doesn't have an R1_APP_CMD analogue

Those changes required some new and updated primitives:

 - Provide utilities to access two SPI-only requests, and one
   request that wasn't previously needed:
     * mmc_spi_read_ocr() ... SPI only
     * mmc_spi_set_crc() ... SPI only (override by module parm)
     * mmc_send_cid() ... for use without broadcast mode

 - Updated internal routines:
     * Previous mmc_send_csd() modified into mmc_send_cxd_native();
       it uses native "R2" responses, which include 16 bytes of data.
     * Previous mmc_send_ext_csd() becomes new mmc_send_cxd_data()
       helper for command-and-data access
     * Bugfix to that mmc_send_cxd_data() code:  dma-to-stack is
       unsafe/nonportable, so kmalloc a bounce buffer instead.

 - Modified mmc_send_ext_csd() now uses mmc_send_cxd_data() helper

 - Modified mmc_send_csd(), and new mmc_spi_send_cid(), routines use
   those helper routines based on whether they're native or SPI

The newest categories of cards supported by the MMC stack aren't expected
to work yet with SPI:  MMC or SD cards with over 4GB data, and SDIO.
All those cards support SPI mode, so eventually they should work too.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

1 files changed, 18 insertions, 6 deletions

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 733ac95331c..8d6f6014870 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);