Merge tag 'mmc-v3.20-1' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Support for MMC power sequences.
   - SDIO function devicetree subnode parsing.
   - Refactor the hardware reset routines and enable it for SD cards.
   - Various code quality improvements, especially for slot-gpio.

  MMC host:
   - dw_mmc: Various fixes and cleanups.
   - dw_mmc: Convert to mmc_send_tuning().
   - moxart: Fix probe logic.
   - sdhci: Various fixes and cleanups
   - sdhci: Asynchronous request handling support.
   - sdhci-pxav3: Various fixes and cleanups.
   - sdhci-tegra: Fixes for T114, T124 and T132.
   - rtsx: Various fixes and cleanups.
   - rtsx: Support for SDIO.
   - sdhi/tmio: Refactor and cleanup of header files.
   - omap_hsmmc: Use slot-gpio and common MMC DT parser.
   - Make all hosts to deal with errors from mmc_of_parse().
   - sunxi: Various fixes and cleanups.
   - sdhci: Support for Fujitsu SDHCI controller f_sdh30"

* tag 'mmc-v3.20-1' of git://git.linaro.org/people/ulf.hansson/mmc: (117 commits)
  mmc: sdhci-s3c: solve problem with sleeping in atomic context
  mmc: pwrseq: add driver for emmc hardware reset
  mmc: moxart: fix probe logic
  mmc: core: Invoke mmc_pwrseq_post_power_on() prior MMC_POWER_ON state
  mmc: pwrseq_simple: Add optional reference clock support
  mmc: pwrseq: Document optional clock for the simple power sequence
  mmc: pwrseq_simple: Extend to support more pins
  mmc: pwrseq: Document that simple sequence support more than one GPIO
  mmc: Add hardware dependencies for sdhci-pxav3 and sdhci-pxav2
  mmc: sdhci-pxav3: Modify clock settings for the SDR50 and DDR50 modes
  mmc: sdhci-pxav3: Extend binding with SDIO3 conf reg for the Armada 38x
  mmc: sdhci-pxav3: Fix Armada 38x controller's caps according to erratum ERR-7878951
  mmc: sdhci-pxav3: Fix SDR50 and DDR50 capabilities for the Armada 38x flavor
  mmc: sdhci: switch voltage before sdhci_set_ios in runtime resume
  mmc: tegra: Write xfer_mode, CMD regs in together
  mmc: Resolve BKOPS compatability issue
  mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles
  mmc: dw_mmc: rockchip: remove incorrect __exit_p()
  mmc: dw_mmc: exynos: remove incorrect __exit_p()
  mmc: Fix menuconfig alignment of MMC_SDHCI_* options
  ...

1 files changed, 53 insertions, 48 deletions

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 7466ce098e60..1d41e8541f38 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -483,11 +483,13 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd)
                 /* check whether the eMMC card supports BKOPS */
                 if (ext_csd[EXT_CSD_BKOPS_SUPPORT] & 0x1) {
                         card->ext_csd.bkops = 1;
-                        card->ext_csd.bkops_en = ext_csd[EXT_CSD_BKOPS_EN];
+                        card->ext_csd.man_bkops_en =
+                                        (ext_csd[EXT_CSD_BKOPS_EN] &
+                                                EXT_CSD_MANUAL_BKOPS_MASK);
                         card->ext_csd.raw_bkops_status =
                                 ext_csd[EXT_CSD_BKOPS_STATUS];
-                        if (!card->ext_csd.bkops_en)
-                                pr_info("%s: BKOPS_EN bit is not set\n",
+                        if (!card->ext_csd.man_bkops_en)
+                                pr_info("%s: MAN_BKOPS_EN bit is not set\n",
                                         mmc_hostname(card->host));
                 }
 
@@ -1155,38 +1157,6 @@ bus_speed:
         return err;
 }
 
-const u8 tuning_blk_pattern_4bit[MMC_TUNING_BLK_PATTERN_4BIT_SIZE] = {
-        0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc,
-        0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,
-        0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,
-        0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,
-        0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,
-        0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,
-        0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,
-        0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde,
-};
-EXPORT_SYMBOL(tuning_blk_pattern_4bit);
-
-const u8 tuning_blk_pattern_8bit[MMC_TUNING_BLK_PATTERN_8BIT_SIZE] = {
-        0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00,
-        0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc, 0xcc,
-        0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff, 0xff,
-        0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee, 0xff,
-        0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xdd,
-        0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xbb,
-        0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff, 0xff,
-        0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, 0xff,
-        0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00,
-        0x00, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc,
-        0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff,
-        0xff, 0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee,
-        0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd,
-        0xdd, 0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff,
-        0xbb, 0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff,
-        0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee,
-};
-EXPORT_SYMBOL(tuning_blk_pattern_8bit);
-
 /*
  * Execute tuning sequence to seek the proper bus operating
  * conditions for HS200 and HS400, which sends CMD21 to the device.
@@ -1194,7 +1164,6 @@ EXPORT_SYMBOL(tuning_blk_pattern_8bit);
 static int mmc_hs200_tuning(struct mmc_card *card)
 {
         struct mmc_host *host = card->host;
-        int err = 0;
 
         /*
          * Timing should be adjusted to the HS400 target
@@ -1205,18 +1174,7 @@ static int mmc_hs200_tuning(struct mmc_card *card)
                 if (host->ops->prepare_hs400_tuning)
                         host->ops->prepare_hs400_tuning(host, &host->ios);
 
-        if (host->ops->execute_tuning) {
-                mmc_host_clk_hold(host);
-                err = host->ops->execute_tuning(host,
-                                MMC_SEND_TUNING_BLOCK_HS200);
-                mmc_host_clk_release(host);
-
-                if (err)
-                        pr_err("%s: tuning execution failed\n",
-                                mmc_hostname(host));
-        }
-
-        return err;
+        return mmc_execute_tuning(card);
 }
 
 /*
@@ -1297,6 +1255,12 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         }
 
         /*
+         * Call the optional HC's init_card function to handle quirks.
+         */
+        if (host->ops->init_card)
+                host->ops->init_card(host, card);
+
+        /*
          * For native busses:  set card RCA and quit open drain mode.
          */
         if (!mmc_host_is_spi(host)) {
@@ -1821,6 +1785,46 @@ static int mmc_power_restore(struct mmc_host *host)
         return ret;
 }
 
+int mmc_can_reset(struct mmc_card *card)
+{
+        u8 rst_n_function;
+
+        rst_n_function = card->ext_csd.rst_n_function;
+        if ((rst_n_function & EXT_CSD_RST_N_EN_MASK) != EXT_CSD_RST_N_ENABLED)
+                return 0;
+        return 1;
+}
+EXPORT_SYMBOL(mmc_can_reset);
+
+static int mmc_reset(struct mmc_host *host)
+{
+        struct mmc_card *card = host->card;
+        u32 status;
+
+        if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
+                return -EOPNOTSUPP;
+
+        if (!mmc_can_reset(card))
+                return -EOPNOTSUPP;
+
+        mmc_host_clk_hold(host);
+        mmc_set_clock(host, host->f_init);
+
+        host->ops->hw_reset(host);
+
+        /* If the reset has happened, then a status command will fail */
+        if (!mmc_send_status(card, &status)) {
+                mmc_host_clk_release(host);
+                return -ENOSYS;
+        }
+
+        /* Set initial state and call mmc_set_ios */
+        mmc_set_initial_state(host);
+        mmc_host_clk_release(host);
+
+        return mmc_power_restore(host);
+}
+
 static const struct mmc_bus_ops mmc_ops = {
         .remove = mmc_remove,
         .detect = mmc_detect,
@@ -1831,6 +1835,7 @@ static const struct mmc_bus_ops mmc_ops = {
         .power_restore = mmc_power_restore,
         .alive = mmc_alive,
         .shutdown = mmc_shutdown,
+        .reset = mmc_reset,
 };
 
 /*