Hi Linus, Here's the pull-request with updates for MMC and MEMSTICK for v5.15. Details about the highlights are as usual found in the signed tag. Please pull this in! Kind regards Ulf Hansson The following changes since commit 885814a97f5a1a2daf66bde5f2076f0bf632c174: Revert "mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711" (2021-08-27 16:30:36 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.15 for you to fetch changes up to a75c956162978097c0a60d95971c97ae486a68d7: Merge branch 'fixes' into next (2021-08-27 16:35:55 +0200) ---------------------------------------------------------------- MMC core: - Return a proper response in case of an ioctl error - Issue HPI to interrupt BKOPS for eMMC if it timed out - Avoid hogging the CPU while polling for busy - Extend sd8787 pwrseq to support the wilc1000 SDIO - Remove a couple of confusing warning messages - Clarify comment for ->card_busy() host ops MMC host: - dw_mmc: Add data CRC error injection - mmci: De-assert reset during ->probe() - rtsx_pci: Fix long reads when clock is pre-scaled - sdhci: Correct the tuning command handle for PIO mode - sdhci-esdhc-imx: Improve support for auto tuning - sdhci-msm: Add support for the sc7280 - sdhci-of-arasan: Don't auto tune for DDR50 mode for ZynqMP - sdhci-of-arasan: Enable support for auto cmd12 - sdhci-of-arasan: Use 19MHz for SD default speed for ZynqMP for level shifter - usdhi6rol0: Implement the ->card_busy() host ops MEMSTICK: - A couple of minor cleanups. ---------------------------------------------------------------- Andy Shevchenko (1): mmc: mmc_spi: Simplify busy loop in mmc_spi_skip() Bean Huo (1): mmc: core: Issue HPI in case the BKOPS timed out Biju Das (2): dt-bindings: mmc: renesas,sdhi: Fix dtbs-check warning dt-bindings: mmc: renesas,sdhi: Document RZ/G2L bindings ChanWoo Lee (2): mmc: queue: Match the data type of max_segments mmc: queue: Remove unused parameters(request_queue) Christophe JAILLET (3): memstick: r592: Change the name of the 'pci_driver' structure to be consistent memstick: switch from 'pci_' to 'dma_' API mmc: switch from 'pci_' to 'dma_' API Claudiu Beznea (4): dt-bindings: mmc: Extend pwrseq-sd8787 binding for wilc1000 mmc: pwrseq: sd8787: add support for wilc1000 mmc: pwrseq: add wilc1000_sdio dependency for pwrseq_sd8787 mmc: pwrseq: sd8787: fix compilation warning Colin Ian King (1): memstick: ms_block: Fix spelling contraction "cant" -> "can't" Eric Biggers (1): mmc: core: Store pointer to bio_crypt_ctx in mmc_request Fabio Estevam (1): mmc: sdhci-esdhc-imx: Remove unneeded mmc-esdhc-imx.h header Haibo Chen (5): mmc: sdhci: Correct the tuning command handle for PIO mode dt-bindings: mmc: fsl-imx-esdhc: add a new compatible string dt-bindings: mmc: fsl-imx-esdhc: change the pinctrl-names rule mmc: sdhci-esdhc-imx: Remove redundant code for manual tuning mmc: sdhci-esdhc-imx: Select the correct mode for auto tuning Linus Walleij (1): mmc: mmci: De-assert reset on probe Manish Narani (6): mmc: sdhci-of-arasan: Modified SD default speed to 19MHz for ZynqMP mmc: sdhci-of-arasan: Add "SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12" quirk. mmc: sdhci-of-arasan: Skip Auto tuning for DDR50 mode in ZynqMP platform mmc: sdhci-of-arasan: Check return value of non-void funtions mmc: sdhci-of-arasan: Use appropriate type of division macro mmc: sdhci-of-arasan: Modify data type of the clk_phase array Mårten Lindahl (2): mmc: usdhi6rol0: Implement card_busy function mmc: core: Update ->card_busy() callback comment Nishad Kamdar (1): mmc: core: Return correct emmc response in case of ioctl error Sahitya Tummala (1): mmc: sdhci-msm: Use maximum possible data timeout value Sai Krishna Potthuri (1): mmc: arasan: Fix the issue in reading tap values from DT Sarthak Garg (1): mmc: sdhci: Introduce max_timeout_count variable in sdhci_host Sean Anderson (2): mmc: sdio: Don't warn about vendor CIS tuples mmc: sdio: Print contents of unknown CIS tuples Shaik Sajida Bhanu (1): dt-bindings: mmc: sdhci-msm: Add compatible string for sc7280 Thomas Hebb (1): mmc: rtsx_pci: Fix long reads when clock is prescaled Tony Lindgren (3): mmc: sdhci: Fix issue with uninitialized dma_slave_config mmc: dw_mmc: Fix issue with uninitialized dma_slave_config mmc: moxart: Fix issue with uninitialized dma_slave_config Ulf Hansson (4): mmc: core: Avoid hogging the CPU while polling for busy in the I/O err path mmc: core: Avoid hogging the CPU while polling for busy for mmc ioctls mmc: core: Avoid hogging the CPU while polling for busy after I/O writes Merge branch 'fixes' into next Vincent Whitchurch (1): mmc: dw_mmc: Add data CRC error injection Wolfram Sang (6): mmc: host: add kdoc for mmc_retune_{en|dis}able mmc: host: factor out clearing the retune state mmc: renesas_sdhi_sys_dmac: use proper DMAENGINE API for termination mmc: sh_mmcif: use proper DMAENGINE API for termination mmc: usdhi6rol0: use proper DMAENGINE API for termination mmc: core: Only print retune error when we don't check for card removal Yoshihiro Shimoda (1): mmc: renesas_sdhi: Refactor renesas_sdhi_probe() .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 18 ++- .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 4 +- .../devicetree/bindings/mmc/renesas,sdhi.yaml | 133 +++++++++++++------- .../devicetree/bindings/mmc/sdhci-msm.txt | 1 + drivers/memstick/core/ms_block.c | 2 +- drivers/memstick/host/r592.c | 9 +- drivers/memstick/host/tifm_ms.c | 12 +- drivers/mmc/core/Kconfig | 2 +- drivers/mmc/core/block.c | 77 +++++------- drivers/mmc/core/core.c | 13 +- drivers/mmc/core/crypto.c | 15 +-- drivers/mmc/core/host.c | 13 +- drivers/mmc/core/host.h | 6 + drivers/mmc/core/mmc_ops.c | 16 ++- drivers/mmc/core/mmc_ops.h | 1 + drivers/mmc/core/pwrseq_sd8787.c | 14 ++- drivers/mmc/core/queue.c | 34 ++---- drivers/mmc/core/sdio_cis.c | 22 +++- drivers/mmc/host/cqhci-crypto.h | 7 +- drivers/mmc/host/dw_mmc.c | 74 +++++++++++ drivers/mmc/host/dw_mmc.h | 7 ++ drivers/mmc/host/mmc_spi.c | 15 +-- drivers/mmc/host/mmci.c | 3 + drivers/mmc/host/moxart-mmc.c | 1 + drivers/mmc/host/renesas_sdhi.h | 9 +- drivers/mmc/host/renesas_sdhi_core.c | 90 +------------- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 135 +++++++++++++++++++-- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 7 +- drivers/mmc/host/rtsx_pci_sdmmc.c | 36 ++++-- drivers/mmc/host/sdhci-esdhc-imx.c | 78 ++++++++++-- drivers/mmc/host/sdhci-msm.c | 3 + drivers/mmc/host/sdhci-of-arasan.c | 51 ++++++-- drivers/mmc/host/sdhci.c | 27 +++-- drivers/mmc/host/sdhci.h | 1 + drivers/mmc/host/sh_mmcif.c | 4 +- drivers/mmc/host/tifm_sd.c | 16 +-- drivers/mmc/host/usdhi6rol0.c | 14 ++- drivers/mmc/host/via-sdmmc.c | 4 +- include/linux/mmc/core.h | 3 +- include/linux/mmc/host.h | 2 +- include/linux/platform_data/mmc-esdhc-imx.h | 42 ------- 41 files changed, 647 insertions(+), 374 deletions(-) delete mode 100644 include/linux/platform_data/mmc-esdhc-imx.h