linux-toradex.git/drivers/mmc/host, branch v4.9.2

mmc: sdhci: Fix recovery from tuning timeout

2017-01-09T07:32:17+00:00

commit 61e53bd0047d58caee0c7170613045bf96de4458 upstream.

Clearing the tuning bits should reset the tuning circuit. However there is
more to do. Reset the command and data lines for good measure, and then
for eMMC ensure the card is not still trying to process a tuning command by
sending a stop command.

Note the JEDEC eMMC specification says the stop command (CMD12) can be used
to stop a tuning command (CMD21) whereas the SD specification is silent on
the subject with respect to the SD tuning command (CMD19). Considering that
CMD12 is not a valid SDIO command, the stop command is sent only when the
tuning command is CMD21 i.e. for eMMC. That addresses cases seen so far
which have been on eMMC.

Note that this replaces the commit fe5fb2e3b58f ("mmc: sdhci: Reset cmd and
data circuits after tuning failure") which is being reverted for v4.9+.

Signed-off-by: Adrian Hunter 
Tested-by: Dan O'Donovan 
Signed-off-by: Ulf Hansson 
Signed-off-by: Greg Kroah-Hartman

Revert "mmc: sdhci: Reset cmd and data circuits after tuning failure"

2017-01-09T07:32:17+00:00

commit 2ca71c27eeaeddae38efe24a84b20e22708a3d1d upstream.

This reverts commit fe5fb2e3b58f ("mmc: sdhci: Reset cmd and data circuits
after tuning failure").

A better fix is available, and it will be applied to older stable releases,
so get this out of the way by reverting it.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson 
Signed-off-by: Greg Kroah-Hartman

mmc: dw_mmc: fix the error handling for dma operation

2016-11-21T10:08:28+00:00

When dma->start is failed,then it has to fall back to PIO mode
for current transfer.

But Host controller was already set to bits relevant to DMA operation.
If needs to use the PIO mode, Host controller has to stop the DMA
operation. (It's more stable than now.)

When it occurred error, it's not running any request.

Fixes: 3fc7eaef44db ("mmc: dw_mmc: Add external dma interface support")
Reported-by: Marek Szyprowski 
Signed-off-by: Jaehoon Chung 
Reviewed-by: Shawn Lin 
Cc:  # v4.3+
Signed-off-by: Jaehoon Chung 
Signed-off-by: Ulf Hansson

mmc: sdhci-of-esdhc: fixup PRESENT_STATE read

2016-11-18T13:41:47+00:00

Since commit 87a18a6a5652 ("mmc: mmc: Use ->card_busy() to detect busy
cards in __mmc_switch()") the ESDHC driver is broken:
  mmc0: Card stuck in programming state! __mmc_switch
  mmc0: error -110 whilst initialising MMC card

Since this commit __mmc_switch() uses ->card_busy(), which is
sdhci_card_busy() for the esdhc driver. sdhci_card_busy() uses the
PRESENT_STATE register, specifically the DAT0 signal level bit. But the
ESDHC uses a non-conformant PRESENT_STATE register, thus a read fixup is
required to make the driver work again.

Signed-off-by: Michael Walle 
Fixes: 87a18a6a5652 ("mmc: mmc: Use ->card_busy() to detect busy cards in __mmc_switch()")
Acked-by: Yangbo Lu 
Acked-by: Adrian Hunter 
Cc:  # v4.8+
Signed-off-by: Ulf Hansson

mmc: mxs: Initialize the spinlock prior to using it

2016-11-07T12:30:08+00:00

An interrupt may occur right after devm_request_irq() is called and
prior to the spinlock initialization, leading to a kernel oops,
as the interrupt handler uses the spinlock.

In order to prevent this problem, move the spinlock initialization
prior to requesting the interrupts.

Fixes: e4243f13d10e (mmc: mxs-mmc: add mmc host driver for i.MX23/28)
Signed-off-by: Fabio Estevam 
Reviewed-by: Marek Vasut 
Signed-off-by: Ulf Hansson

mmc: sdhci: Fix missing enhanced strobe setting during runtime resume

2016-11-07T12:26:43+00:00

Restore enhanced strobe setting during runtime resume.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson

mmc: sdhci: Reset cmd and data circuits after tuning failure

2016-11-07T12:26:43+00:00

To prevent subsequent commands failing, ensure the cmd and data circuits
are reset after a tuning timeout.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson

mmc: sdhci: Fix unexpected data interrupt handling

2016-11-07T12:26:42+00:00

In the busy response case (i.e. !host->data), an unexpected data interrupt
would result in clearing the data command as though it had completed but
without informing the upper layers and thus resulting in a hang.  Fix by
only clearing the data command for data interrupts that are expected.

Signed-off-by: Adrian Hunter 
Cc: stable@vger.kernel.org # v4.8+
Signed-off-by: Ulf Hansson

mmc: sdhci: Fix CMD line reset interfering with ongoing data transfer

2016-11-07T12:26:42+00:00

CMD line reset during an ongoing data transfer can cause the data transfer
to hang.  Fix by delaying the reset until the data transfer is finished.

Signed-off-by: Adrian Hunter 
Cc: stable@vger.kernel.org # v4.8+
Signed-off-by: Ulf Hansson

mmc: dw_mmc: add the "reset" as name of reset controller

2016-11-07T07:53:46+00:00

Add the "reset" as name of reset controller.
This is for preventing the wrong operation. Even if some SoC has reset
controller, doesn't define "resets" in device-tree.
Then it might be waiting for reset controller and it should be stuck.

Fixes: d6786fefe816 ("mmc: dw_mmc: add reset support to dwmmc host controller")
Signed-off-by: Jaehoon Chung 
Acked-by: John Stultz 
Signed-off-by: Ulf Hansson