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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (42 commits)
  atmel-mci: fix sdc_reg typo
  tmio_mmc: add maintainer
  mmc: Add OpenFirmware bindings for SDHCI driver
  sdhci: Add quirk for forcing maximum block size to 2048 bytes
  sdhci: Add quirk for controllers that need IRQ re-init after reset
  sdhci: Add quirk for controllers that need small delays for PIO
  sdhci: Add set_clock callback and a quirk for nonstandard clocks
  sdhci: Add get_{max,timeout}_clock callbacks
  sdhci: Add support for hosts reporting inverted write-protect state
  sdhci: Add support for card-detection polling
  sdhci: Enable only relevant (DMA/PIO) interrupts during transfers
  sdhci: Split card-detection IRQs management from sdhci_init()
  sdhci: Add support for bus-specific IO memory accessors
  mmc_spi: adjust for delayed data token response
  omap_hsmmc: Wait for SDBP
  omap_hsmmc: Fix MMC3 dma
  omap_hsmmc: Disable SDBP at suspend
  omap_hsmmc: Do not prefix slot name
  omap_hsmmc: Allow cover switch to cause rescan
  omap_hsmmc: Add 8-bit bus width mode support
  ...

5 files changed, 109 insertions, 0 deletions

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index f210a8ee686..bdb165f9304 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -84,6 +84,14 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
         }
 
         retval = add_uevent_var(env, "MMC_NAME=%s", mmc_card_name(card));
+        if (retval)
+                return retval;
+
+        /*
+         * Request the mmc_block device.  Note: that this is a direct request
+         * for the module it carries no information as to what is inserted.
+         */
+        retval = add_uevent_var(env, "MODALIAS=mmc:block");
 
         return retval;
 }
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 1445ea8f10a..fa073ab3fa3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -298,6 +298,21 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
                         data->timeout_clks = 0;
                 }
         }
+        /*
+         * Some cards need very high timeouts if driven in SPI mode.
+         * The worst observed timeout was 900ms after writing a
+         * continuous stream of data until the internal logic
+         * overflowed.
+         */
+        if (mmc_host_is_spi(card->host)) {
+                if (data->flags & MMC_DATA_WRITE) {
+                        if (data->timeout_ns < 1000000000)
+                                data->timeout_ns = 1000000000;  /* 1s */
+                } else {
+                        if (data->timeout_ns < 100000000)
+                                data->timeout_ns =  100000000;  /* 100ms */
+                }
+        }
 }
 EXPORT_SYMBOL(mmc_set_data_timeout);
 
@@ -915,6 +930,7 @@ void mmc_stop_host(struct mmc_host *host)
         spin_unlock_irqrestore(&host->lock, flags);
 #endif
 
+        cancel_delayed_work(&host->detect);
         mmc_flush_scheduled_work();
 
         mmc_bus_get(host);
@@ -942,6 +958,7 @@ void mmc_stop_host(struct mmc_host *host)
  */
 int mmc_suspend_host(struct mmc_host *host, pm_message_t state)
 {
+        cancel_delayed_work(&host->detect);
         mmc_flush_scheduled_work();
 
         mmc_bus_get(host);
@@ -975,6 +992,7 @@ int mmc_resume_host(struct mmc_host *host)
         mmc_bus_get(host);
         if (host->bus_ops && !host->bus_dead) {
                 mmc_power_up(host);
+                mmc_select_voltage(host, host->ocr);
                 BUG_ON(!host->bus_ops->resume);
                 host->bus_ops->resume(host);
         }
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 1237bb4c722..610dbd1fcc8 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -184,6 +184,68 @@ static int mmc_dbg_card_status_get(void *data, u64 *val)
 DEFINE_SIMPLE_ATTRIBUTE(mmc_dbg_card_status_fops, mmc_dbg_card_status_get,
                 NULL, "%08llx\n");
 
+#define EXT_CSD_STR_LEN 1025
+
+static int mmc_ext_csd_open(struct inode *inode, struct file *filp)
+{
+        struct mmc_card *card = inode->i_private;
+        char *buf;
+        ssize_t n = 0;
+        u8 *ext_csd;
+        int err, i;
+
+        buf = kmalloc(EXT_CSD_STR_LEN + 1, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        ext_csd = kmalloc(512, GFP_KERNEL);
+        if (!ext_csd) {
+                err = -ENOMEM;
+                goto out_free;
+        }
+
+        mmc_claim_host(card->host);
+        err = mmc_send_ext_csd(card, ext_csd);
+        mmc_release_host(card->host);
+        if (err)
+                goto out_free;
+
+        for (i = 511; i >= 0; i--)
+                n += sprintf(buf + n, "%02x", ext_csd[i]);
+        n += sprintf(buf + n, "\n");
+        BUG_ON(n != EXT_CSD_STR_LEN);
+
+        filp->private_data = buf;
+        kfree(ext_csd);
+        return 0;
+
+out_free:
+        kfree(buf);
+        kfree(ext_csd);
+        return err;
+}
+
+static ssize_t mmc_ext_csd_read(struct file *filp, char __user *ubuf,
+                                size_t cnt, loff_t *ppos)
+{
+        char *buf = filp->private_data;
+
+        return simple_read_from_buffer(ubuf, cnt, ppos,
+                                       buf, EXT_CSD_STR_LEN);
+}
+
+static int mmc_ext_csd_release(struct inode *inode, struct file *file)
+{
+        kfree(file->private_data);
+        return 0;
+}
+
+static struct file_operations mmc_dbg_ext_csd_fops = {
+        .open           = mmc_ext_csd_open,
+        .read           = mmc_ext_csd_read,
+        .release        = mmc_ext_csd_release,
+};
+
 void mmc_add_card_debugfs(struct mmc_card *card)
 {
         struct mmc_host *host = card->host;
@@ -211,6 +273,11 @@ void mmc_add_card_debugfs(struct mmc_card *card)
                                         &mmc_dbg_card_status_fops))
                         goto err;
 
+        if (mmc_card_mmc(card))
+                if (!debugfs_create_file("ext_csd", S_IRUSR, root, card,
+                                        &mmc_dbg_ext_csd_fops))
+                        goto err;
+
         return;
 
 err:
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index 956bd767750..963f2937c5e 100644
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -223,10 +223,18 @@ static int sdio_read_cis(struct mmc_card *card, struct sdio_func *func)
                 if (tpl_code == 0xff)
                         break;
 
+                /* null entries have no link field or data */
+                if (tpl_code == 0x00)
+                        continue;
+
                 ret = mmc_io_rw_direct(card, 0, 0, ptr++, 0, &tpl_link);
                 if (ret)
                         break;
 
+                /* a size of 0xff also means we're done */
+                if (tpl_link == 0xff)
+                        break;
+
                 this = kmalloc(sizeof(*this) + tpl_link, GFP_KERNEL);
                 if (!this)
                         return -ENOMEM;
diff --git a/drivers/mmc/core/sdio_ops.c b/drivers/mmc/core/sdio_ops.c
index c8fa095a448..4eb7825fd1a 100644
--- a/drivers/mmc/core/sdio_ops.c
+++ b/drivers/mmc/core/sdio_ops.c
@@ -76,6 +76,10 @@ int mmc_io_rw_direct(struct mmc_card *card, int write, unsigned fn,
         BUG_ON(!card);
         BUG_ON(fn > 7);
 
+        /* sanity check */
+        if (addr & ~0x1FFFF)
+                return -EINVAL;
+
         memset(&cmd, 0, sizeof(struct mmc_command));
 
         cmd.opcode = SD_IO_RW_DIRECT;
@@ -125,6 +129,10 @@ int mmc_io_rw_extended(struct mmc_card *card, int write, unsigned fn,
         WARN_ON(blocks == 0);
         WARN_ON(blksz == 0);
 
+        /* sanity check */
+        if (addr & ~0x1FFFF)
+                return -EINVAL;
+
         memset(&mrq, 0, sizeof(struct mmc_request));
         memset(&cmd, 0, sizeof(struct mmc_command));
         memset(&data, 0, sizeof(struct mmc_data));