Merge tag 'mmc-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Introduce host claiming by context to support blkmq
   - Preparations for enabling CQE (eMMC CMDQ) requests
   - Re-factorizations to prepare for blkmq support
   - Re-factorizations to prepare for CQE support
   - Fix signal voltage switch for SD cards without power cycle
   - Convert RPMB to a character device
   - Export eMMC revision via sysfs
   - Support eMMC DT binding for fixed driver type
   - Document mmc_regulator_get_supply() API

 MMC host:
   - omap_hsmmc: Updated regulator management for PBIAS
   - sdhci-omap: Add new OMAP SDHCI driver
   - meson-mx-sdio: New driver for the Amlogic Meson8 and Meson8b SoCs
   - sdhci-pci: Add support for Intel CDF
   - sdhci-acpi: Fix voltage switch for some Intel host controllers
   - sdhci-msm: Enable delay circuit calibration clocks
   - sdhci-msm: Manage power IRQ properly
   - mediatek: Add support of mt2701/mt2712
   - mediatek: Updates management of clocks and tunings
   - mediatek: Upgrade eMMC HS400 support
   - rtsx_pci: Update tuning for gen3 PCI-Express
   - renesas_sdhi: Support R-Car Gen[123] fallback compatibility strings
   - Catch all errors when getting regulators
   - Various additional improvements and cleanups"

* tag 'mmc-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (91 commits)
  sdhci-fujitsu: add support for setting the CMD_DAT_DELAY attribute
  dt-bindings: sdhci-fujitsu: document cmd-dat-delay property
  mmc: tmio: Replace msleep() of 20ms or less with usleep_range()
  mmc: dw_mmc: Convert timers to use timer_setup()
  mmc: dw_mmc: Cleanup the DTO timer like the CTO one
  mmc: vub300: Use common code in __download_offload_pseudocode()
  mmc: tmio: Use common error handling code in tmio_mmc_host_probe()
  mmc: Convert timers to use timer_setup()
  mmc: sdhci-acpi: Fix voltage switch for some Intel host controllers
  mmc: sdhci-acpi: Let devices define their own private data
  mmc: mediatek: perfer to use rise edge latching for cmd line
  mmc: mediatek: improve eMMC hs400 mode read performance
  mmc: mediatek: add latch-ck support
  mmc: mediatek: add support of source_cg clock
  mmc: mediatek: add stop_clk fix and enhance_rx support
  mmc: mediatek: add busy_check support
  mmc: mediatek: add async fifo and data tune support
  mmc: mediatek: add pad_tune0 support
  mmc: mediatek: make hs400_tune_response only for mt8173
  arm64: dts: mt8173: remove "mediatek, mt8135-mmc" from mmc nodes
  ...

1 files changed, 25 insertions, 16 deletions

diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index 0a4e77a5ba33..4f33d277b125 100644
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -30,7 +30,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)
 {
         struct mmc_queue *mq = q->queuedata;
 
-        if (mq && (mmc_card_removed(mq->card) || mmc_access_rpmb(mq)))
+        if (mq && mmc_card_removed(mq->card))
                 return BLKPREP_KILL;
 
         req->rq_flags |= RQF_DONTPREP;
@@ -177,6 +177,29 @@ static void mmc_exit_request(struct request_queue *q, struct request *req)
         mq_rq->sg = NULL;
 }
 
+static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card)
+{
+        struct mmc_host *host = card->host;
+        u64 limit = BLK_BOUNCE_HIGH;
+
+        if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)
+                limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
+
+        queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mq->queue);
+        queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, mq->queue);
+        if (mmc_can_erase(card))
+                mmc_queue_setup_discard(mq->queue, card);
+
+        blk_queue_bounce_limit(mq->queue, limit);
+        blk_queue_max_hw_sectors(mq->queue,
+                min(host->max_blk_count, host->max_req_size / 512));
+        blk_queue_max_segments(mq->queue, host->max_segs);
+        blk_queue_max_segment_size(mq->queue, host->max_seg_size);
+
+        /* Initialize thread_sem even if it is not used */
+        sema_init(&mq->thread_sem, 1);
+}
+
 /**
  * mmc_init_queue - initialise a queue structure.
  * @mq: mmc queue
@@ -190,12 +213,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
                    spinlock_t *lock, const char *subname)
 {
         struct mmc_host *host = card->host;
-        u64 limit = BLK_BOUNCE_HIGH;
         int ret = -ENOMEM;
 
-        if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)
-                limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
-
         mq->card = card;
         mq->queue = blk_alloc_queue(GFP_KERNEL);
         if (!mq->queue)
@@ -214,18 +233,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
         }
 
         blk_queue_prep_rq(mq->queue, mmc_prep_request);
-        queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mq->queue);
-        queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, mq->queue);
-        if (mmc_can_erase(card))
-                mmc_queue_setup_discard(mq->queue, card);
 
-        blk_queue_bounce_limit(mq->queue, limit);
-        blk_queue_max_hw_sectors(mq->queue,
-                min(host->max_blk_count, host->max_req_size / 512));
-        blk_queue_max_segments(mq->queue, host->max_segs);
-        blk_queue_max_segment_size(mq->queue, host->max_seg_size);
-
-        sema_init(&mq->thread_sem, 1);
+        mmc_setup_queue(mq, card);
 
         mq->thread = kthread_run(mmc_queue_thread, mq, "mmcqd/%d%s",
                 host->index, subname ? subname : "");