[GIT PULL] MMC fixes for v5.15-rc8

[GIT PULL] MMC fixes for v5.15-rc8

[Ulf Hansson]

Hi Linus,

Here's a PR with a couple of MMC fixes intended for v5.15-rc8. 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 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc:

  Linux 5.15-rc5 (2021-10-10 17:01:59 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.15-rc5

for you to fetch changes up to 90935eb303e0d12f3d3d0383262e65290321f5f6:

  mmc: tmio: reenable card irqs after the reset callback (2021-10-28 23:19:32 +0200)

----------------------------------------------------------------
MMC host:
 - tmio: Re-enable card irqs after a reset
 - mtk-sd: Fixup probing of cqhci for crypto
 - cqhci: Fix support for suspend/resume
 - vub300: Fix control-message timeouts
 - dw_mmc-exynos: Fix support for tuning
 - winbond: Silences build errors on M68K
 - sdhci-esdhc-imx: Fix support for tuning
 - sdhci-pci: Read card detect from ACPI for Intel Merrifield
 - sdhci: Fix eMMC support for Thundercomm TurboX CM2290

----------------------------------------------------------------
Andy Shevchenko (1):
      mmc: sdhci-pci: Read card detect from ACPI for Intel Merrifield

Haibo Chen (1):
      mmc: sdhci-esdhc-imx: clear the buffer_read_ready to reset standard tuning circuit

Jaehoon Chung (1):
      mmc: dw_mmc: exynos: fix the finding clock sample value

Johan Hovold (1):
      mmc: vub300: fix control-message timeouts

Randy Dunlap (1):
      mmc: winbond: don't build on M68K

Shawn Guo (1):
      mmc: sdhci: Map more voltage level to SDHCI_POWER_330

Wenbin Mei (2):
      mmc: cqhci: clear HALT state after CQE enable
      mmc: mediatek: Move cqhci init behind ungate clock

Wolfram Sang (1):
      mmc: tmio: reenable card irqs after the reset callback

 drivers/mmc/host/Kconfig           |  2 +-
 drivers/mmc/host/cqhci-core.c      |  3 +++
 drivers/mmc/host/dw_mmc-exynos.c   | 14 ++++++++++++++
 drivers/mmc/host/mtk-sd.c          | 38 +++++++++++++++++++-------------------
 drivers/mmc/host/sdhci-esdhc-imx.c | 16 ++++++++++++++++
 drivers/mmc/host/sdhci-pci-core.c  | 29 ++++++++++++++++++++++++-----
 drivers/mmc/host/sdhci.c           |  6 ++++++
 drivers/mmc/host/tmio_mmc_core.c   | 17 ++++++++++++-----
 drivers/mmc/host/vub300.c          | 18 +++++++++---------
 9 files changed, 104 insertions(+), 39 deletions(-)

Re: [GIT PULL] MMC fixes for v5.15-rc8

[Linus Torvalds]

On Fri, Oct 29, 2021 at 5:07 AM Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
>  - winbond: Silences build errors on M68K

I think this one is wrong.

I think the problem is that m68k declares "claim_dma_lock()" in the
wrong header file. It's in <asm/floppy.h> instead of <asm/dma.h>

I'm somewhat surprised that this doesn't hit m68k in other places -
there are other drivers that use that same ISA DMA interface.

I've pulled this, but I hate how random that fix is.

(And on the topic of hate - the merge messages are just auto-munged
from the commit line - please spend a _bit_ more time on it, ok? Or at
least make it closer to proper English - things like "Re-enable card
irqs after a reset in tmio driver" instead of "tmio: Re-enable card
irqs after a reset")

              Linus

Re: [GIT PULL] MMC fixes for v5.15-rc8

[Randy Dunlap]

On 10/29/21 11:04 AM, Linus Torvalds wrote:
> On Fri, Oct 29, 2021 at 5:07 AM Ulf Hansson <ulf.hansson@linaro.org> wrote:
>>
>>   - winbond: Silences build errors on M68K
> 
> I think this one is wrong.
> 
> I think the problem is that m68k declares "claim_dma_lock()" in the
> wrong header file. It's in <asm/floppy.h> instead of <asm/dma.h>
> 
> I'm somewhat surprised that this doesn't hit m68k in other places -
> there are other drivers that use that same ISA DMA interface.

I moved claim_dma_lock() and release_dma_lock() fro asm/floppy.h
to asm/dma.h (for arch/m68k/). I spent a few hours trying to fix
the resulting fallout.  Guess I'm just slow.

FWIW, the biggest problem I had was the variety of types of DMA that
M68K supports (once a driver includes <asm/dma.h>, things get messy).

> I've pulled this, but I hate how random that fix is.


-- 
~Randy

Re: [GIT PULL] MMC fixes for v5.15-rc8

[pr-tracker-bot]

The pull request you sent on Fri, 29 Oct 2021 14:07:09 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git tags/mmc-v5.15-rc5

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/17d50f89410c5f71142657d9a012cbabcaadb134

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html