linux.git/drivers/mmc, branch v3.10.31

mmc: atmel-mci: fix timeout errors in SDIO mode when using DMA

2014-02-13T21:48:00+00:00

commit 66b512eda74d59b17eac04c4da1b38d82059e6c9 upstream.

With some SDIO devices, timeout errors can happen when reading data.
To solve this issue, the DMA transfer has to be activated before sending
the command to the device. This order is incorrect in PDC mode. So we
have to take care if we are using DMA or PDC to know when to send the
MMC command.

Signed-off-by: Ludovic Desroches 
Acked-by: Nicolas Ferre 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: fix host release issue after discard operation

2014-02-13T21:48:00+00:00

commit f662ae48ae67dfd42739e65750274fe8de46240a upstream.

Under function mmc_blk_issue_rq, after an MMC discard operation,
the MMC request data structure may be freed in memory. Later in
the same function, the check of req->cmd_flags & MMC_REQ_SPECIAL_MASK
is dangerous and invalid. It causes the MMC host not to be released
when it should.

This patch fixes the issue by marking the special request down before
the discard/flush operation.

Reported by: Harold (SoonYeal) Yang 
Signed-off-by: Ray Jui 
Reviewed-by: Seungwon Jeon 
Acked-by: Seungwon Jeon 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: block: fix a bug of error handling in MMC driver

2013-12-08T15:29:27+00:00

commit c8760069627ad3b0dbbea170f0c4c58b16e18d3d upstream.

Current MMC driver doesn't handle generic error (bit19 of device
status) in write sequence. As a result, write data gets lost when
generic error occurs. For example, a generic error when updating a
filesystem management information causes a loss of write data and
corrupts the filesystem. In the worst case, the system will never
boot.

This patch includes the following functionality:
  1. To enable error checking for the response of CMD12 and CMD13
     in write command sequence
  2. To retry write sequence when a generic error occurs

Messages are added for v2 to show what occurs.

Signed-off-by: KOBAYASHI Yoshitake 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: atmel-mci: fix oops in atmci_tasklet_func

2013-12-04T18:56:40+00:00

commit fbd986cd420d1deeabf1039ec4e74075a5639db5 upstream.

In some cases, a NULL pointer dereference happens because data is NULL when
STATE_END_REQUEST case is reached in atmci_tasklet_func.

Signed-off-by: Rodolfo Giometti 
Acked-by: Ludovic Desroches 
Acked-by: Nicolas Ferre 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: atmel-mci: abort transfer on timeout error

2013-12-04T18:56:39+00:00

commit c1fa3426aa5c782724c97394303d52228206eda4 upstream.

When a software timeout occurs, the transfer is not stopped. In DMA case,
it causes DMA channel to be stuck because the transfer is still active
causing following transfers to be queued but not computed.

Signed-off-by: Ludovic Desroches 
Reported-by: Alexander Morozov 
Acked-by: Nicolas Ferre 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: tmio_mmc_dma: fix PIO fallback on SDHI

2013-09-27T00:18:29+00:00

commit f936f9b67b7f8c2eae01dd303a0e90bd777c4679 upstream.

I'm testing SH-Mobile SDHI driver in DMA mode with  a new DMA controller  using
'bonnie++' and getting DMA error after which the tmio_mmc_dma.c code falls back
to PIO but all commands time out after that.  It turned out that the fallback
code calls tmio_mmc_enable_dma() with RX/TX channels already freed and pointers
to them cleared, so that the function bails out early instead  of clearing the
DMA bit in the CTL_DMA_ENABLE register. The regression was introduced by commit
162f43e31c5a376ec16336e5d0ac973373d54c89 (mmc: tmio: fix a deadlock).
Moving tmio_mmc_enable_dma() calls to the top of the PIO fallback code in
tmio_mmc_start_dma_{rx|tx}() helps.

Signed-off-by: Sergei Shtylyov 
Acked-by: Guennadi Liakhovetski 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: omap_hsmmc: Skip platform_get_resource_byname() for dt case

2013-05-26T18:23:11+00:00

MMC driver probe will abort for DT case because of failed
platform_get_resource_byname() lookup. Fix it by skipping resource
lookup byname for device tree build.

Issue is hidden because hwmod populates the IO resources which
helps to succeed platform_get_resource_byname() and probe.

Signed-off-by: Santosh Shilimkar 
Signed-off-by: Balaji T K 
Signed-off-by: Chris Ball

mmc: omap_hsmmc: convert to dma_request_slave_channel_compat

2013-05-26T18:23:10+00:00

Convert dmaengine channel requests to use
dma_request_slave_channel_compat(). This supports platforms booting
with or without DT populated.

Signed-off-by: Matt Porter 
Acked-by: Tony Lindgren 
Acked-by: Arnd Bergmann 
Signed-off-by: Balaji T K 
Signed-off-by: Chris Ball

mmc: omap_hsmmc: Fix the DT pbias workaround for MMC controllers 2 to 5

2013-05-26T18:23:09+00:00

Otherwise SDIO cards won't necessarily work when booted with
device tree as we will never power down the SDIO cards. This
means the SDIO card reset does not happen which at least some
WLAN controllers expect to happen with ifconfig wlan0 down.

The PBIAS voltage is only available for the first controller
instance, so let's limit the PBIAS workaround to the first
controller only.

Signed-off-by: Tony Lindgren 
Tested-by: Luciano Coelho 
Signed-off-by: Balaji T K 
Signed-off-by: Chris Ball

mmc: sdhci-pci: add more device ids

2013-05-26T17:50:50+00:00

Add three more PCI device ids.

Signed-off-by: Adrian Hunter 
Signed-off-by: Chris Ball