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

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Decrease polling rate for erase/trim/discard
   - Allow non-sleeping GPIOs for card detect
   - Improve mmc block removal path
   - Enable support for mmc_sw_reset() for SDIO cards
   - Add mmc_sw_reset() to allow users to do a soft reset of the card
   - Allow power delay to be tunable via DT
   - Allow card detect debounce delay to be tunable via DT
   - Enable new quirk to limit clock rate for Marvell 8887 chip
   - Don't show eMMC RPMB and BOOT areas in /proc/partitions
   - Add capability to avoid 3.3V signaling for fragile HWs

  MMC host:
   - Improve/fixup support for handle highmem pages
   - Remove depends on HAS_DMA in case of platform dependency
   - mvsdio: Enable support for erase/trim/discard
   - rtsx_usb: Enable support for erase/trim/discard
   - renesas_sdhi: Fix WP logic regressions
   - renesas_sdhi: Add r8a77965 support
   - renesas_sdhi: Add R8A77980 to whitelist
   - meson: Add optional support for device reset
   - meson: Add support for the Meson-AXG platform
   - dw_mmc: Add new driver for BlueField DW variant
   - mediatek: Add support for 64G DRAM DMA
   - sunxi: Deploy runtime PM support
   - jz4740: Add support for JZ4780
   - jz4740: Enable support for DT based platforms
   - sdhci: Various improvement to timeout handling
   - sdhci: Disable support for HS200/HS400/UHS when no 1.8V support
   - sdhci-omap: Add support for controller in k2g SoC
   - sdhci-omap: Add workarounds for a couple of Erratas
   - sdhci-omap: Enable support for generic sdhci DT properties
   - sdhci-cadence: Re-send tune request to deal with errata
   - sdhci-pci: Fix 3.3V voltage switch for some BYT-based Intel controllers
   - sdhci-pci: Avoid 3.3V signaling on some NI 904x
   - sdhci-esdhc-imx: Use watermark levels for PIO access
   - sdhci-msm: Improve card detection handling
   - sdhci-msm: Add support voltage pad switching"

* tag 'mmc-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (104 commits)
  mmc: renesas_sdhi: really fix WP logic regressions
  mmc: mvsdio: Enable MMC_CAP_ERASE
  mmc: mvsdio: Respect card busy time out from mmc core
  mmc: sdhci-msm: Remove NO_CARD_NO_RESET quirk
  mmc: sunxi: Use ifdef rather than __maybe_unused
  mmc: mxmmc: Use ifdef rather than __maybe_unused
  mmc: mxmmc: include linux/highmem.h
  mmc: sunxi: mark PM functions as __maybe_unused
  mmc: Throttle calls to MMC_SEND_STATUS during mmc_do_erase()
  mmc: au1xmmc: handle highmem pages
  mmc: Allow non-sleeping GPIO cd
  mmc: sdhci-*: Don't emit error msg if sdhci_add_host() fails
  mmc: sd: Define name for default speed dtr
  mmc: core: Move calls to ->prepare_hs400_tuning() closer to mmc code
  mmc: sdhci-xenon: use match_string() helper
  mmc: wbsd: handle highmem pages
  mmc: ushc: handle highmem pages
  mmc: mxcmmc: handle highmem pages
  mmc: atmel-mci: use sg_copy_{from,to}_buffer
  mmc: android-goldfish: use sg_copy_{from,to}_buffer
  ...

1 files changed, 30 insertions, 38 deletions

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index f4233576153b..1e54bbf13d75 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -268,43 +268,29 @@ static inline int wbsd_next_sg(struct wbsd_host *host)
         return host->num_sg;
 }
 
-static inline char *wbsd_sg_to_buffer(struct wbsd_host *host)
+static inline char *wbsd_map_sg(struct wbsd_host *host)
 {
-        return sg_virt(host->cur_sg);
+        return kmap_atomic(sg_page(host->cur_sg)) + host->cur_sg->offset;
 }
 
 static inline void wbsd_sg_to_dma(struct wbsd_host *host, struct mmc_data *data)
 {
-        unsigned int len, i;
-        struct scatterlist *sg;
-        char *dmabuf = host->dma_buffer;
-        char *sgbuf;
-
-        sg = data->sg;
-        len = data->sg_len;
-
-        for (i = 0; i < len; i++) {
-                sgbuf = sg_virt(&sg[i]);
-                memcpy(dmabuf, sgbuf, sg[i].length);
-                dmabuf += sg[i].length;
-        }
+        size_t len = 0;
+        int i;
+
+        for (i = 0; i < data->sg_len; i++)
+                len += data->sg[i].length;
+        sg_copy_to_buffer(data->sg, data->sg_len, host->dma_buffer, len);
 }
 
 static inline void wbsd_dma_to_sg(struct wbsd_host *host, struct mmc_data *data)
 {
-        unsigned int len, i;
-        struct scatterlist *sg;
-        char *dmabuf = host->dma_buffer;
-        char *sgbuf;
-
-        sg = data->sg;
-        len = data->sg_len;
-
-        for (i = 0; i < len; i++) {
-                sgbuf = sg_virt(&sg[i]);
-                memcpy(sgbuf, dmabuf, sg[i].length);
-                dmabuf += sg[i].length;
-        }
+        size_t len = 0;
+        int i;
+
+        for (i = 0; i < data->sg_len; i++)
+                len += data->sg[i].length;
+        sg_copy_from_buffer(data->sg, data->sg_len, host->dma_buffer, len);
 }
 
 /*
@@ -418,7 +404,7 @@ static void wbsd_empty_fifo(struct wbsd_host *host)
 {
         struct mmc_data *data = host->mrq->cmd->data;
         char *buffer;
-        int i, fsr, fifo;
+        int i, idx, fsr, fifo;
 
         /*
          * Handle excessive data.
@@ -426,7 +412,8 @@ static void wbsd_empty_fifo(struct wbsd_host *host)
         if (host->num_sg == 0)
                 return;
 
-        buffer = wbsd_sg_to_buffer(host) + host->offset;
+        buffer = wbsd_map_sg(host) + host->offset;
+        idx = 0;
 
         /*
          * Drain the fifo. This has a tendency to loop longer
@@ -445,8 +432,7 @@ static void wbsd_empty_fifo(struct wbsd_host *host)
                         fifo = 1;
 
                 for (i = 0; i < fifo; i++) {
-                        *buffer = inb(host->base + WBSD_DFR);
-                        buffer++;
+                        buffer[idx++] = inb(host->base + WBSD_DFR);
                         host->offset++;
                         host->remain--;
 
@@ -456,16 +442,19 @@ static void wbsd_empty_fifo(struct wbsd_host *host)
                          * End of scatter list entry?
                          */
                         if (host->remain == 0) {
+                                kunmap_atomic(buffer);
                                 /*
                                  * Get next entry. Check if last.
                                  */
                                 if (!wbsd_next_sg(host))
                                         return;
 
-                                buffer = wbsd_sg_to_buffer(host);
+                                buffer = wbsd_map_sg(host);
+                                idx = 0;
                         }
                 }
         }
+        kunmap_atomic(buffer);
 
         /*
          * This is a very dirty hack to solve a
@@ -480,7 +469,7 @@ static void wbsd_fill_fifo(struct wbsd_host *host)
 {
         struct mmc_data *data = host->mrq->cmd->data;
         char *buffer;
-        int i, fsr, fifo;
+        int i, idx, fsr, fifo;
 
         /*
          * Check that we aren't being called after the
@@ -489,7 +478,8 @@ static void wbsd_fill_fifo(struct wbsd_host *host)
         if (host->num_sg == 0)
                 return;
 
-        buffer = wbsd_sg_to_buffer(host) + host->offset;
+        buffer = wbsd_map_sg(host) + host->offset;
+        idx = 0;
 
         /*
          * Fill the fifo. This has a tendency to loop longer
@@ -508,8 +498,7 @@ static void wbsd_fill_fifo(struct wbsd_host *host)
                         fifo = 15;
 
                 for (i = 16; i > fifo; i--) {
-                        outb(*buffer, host->base + WBSD_DFR);
-                        buffer++;
+                        outb(buffer[idx], host->base + WBSD_DFR);
                         host->offset++;
                         host->remain--;
 
@@ -519,16 +508,19 @@ static void wbsd_fill_fifo(struct wbsd_host *host)
                          * End of scatter list entry?
                          */
                         if (host->remain == 0) {
+                                kunmap_atomic(buffer);
                                 /*
                                  * Get next entry. Check if last.
                                  */
                                 if (!wbsd_next_sg(host))
                                         return;
 
-                                buffer = wbsd_sg_to_buffer(host);
+                                buffer = wbsd_map_sg(host);
+                                idx = 0;
                         }
                 }
         }
+        kunmap_atomic(buffer);
 
         /*
          * The controller stops sending interrupts for