linux-stable.git/drivers/mmc, branch v3.0.22

mmc: sd: Fix SDR12 timing regression

2012-01-26T01:24:46+00:00

commit dd8df17fe83483d7ea06ff229895e35a42071599 upstream.

This patch fixes a failure to recognize SD cards reported on a Dell
Vostro with O2 Micro SD card reader.  Patch 49c468f ("mmc: sd: add
support for uhs bus speed mode selection") caused the problem, by
setting the SDHCI_CTRL_HISPD flag even for legacy timings.

Signed-off-by: Alexander Elbs 
Acked-by: Philip Rakity 
Acked-by: Arindam Nath 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: sdhci: Fix tuning timer incorrect setting when suspending host

2012-01-26T01:24:46+00:00

commit c6ced0db08010ed75df221a2946c5228454b38d5 upstream.

When suspending host, the tuning timer shoule be deactivated.
And the HOST_NEEDS_TUNING flag should be set after tuning timer is
deactivated.

Signed-off-by: Philip Rakity 
Signed-off-by: Aaron Lu 
Acked-by: Adrian Hunter 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: core: Fix voltage select in DDR mode

2012-01-26T01:24:45+00:00

commit 913047e9e5787a90696533a9f109552b7694ecc9 upstream.

This patch fixes the wrong comparison before setting the interface
voltage in DDR mode.

The assignment to the variable ddr before comaprison is either
ddr = MMC_1_2V_DDR_MODE; or ddr == MMC_1_8V_DDR_MODE. But the comparison
is done with the extended csd value if ddr == EXT_CSD_CARD_TYPE_DDR_1_2V.

Signed-off-by: Girish K S 
Acked-by: Subhash Jadavani 
Acked-by: Philip Rakity 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

ARM: 7220/1: mmc: mmci: Fixup error handling for dma

2012-01-06T22:13:56+00:00

commit 3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5 upstream.

When getting a cmd irq during an ongoing data transfer
with dma, the dma job were never terminated. This is now
corrected.

Tested-by: Linus Walleij 
Signed-off-by: Per Forlin 
Signed-off-by: Ulf Hansson 
Signed-off-by: Russell King 
Signed-off-by: Greg Kroah-Hartman

ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR

2012-01-06T22:13:56+00:00

commit b63038d6f4ca5d1849ce01d9fc5bb9cb426dec73 upstream.

The interrupt was previously enabled and then correctly cleared.
Now we also handle it correctly.

Tested-by: Linus Walleij 
Signed-off-by: Ulf Hansson 
Signed-off-by: Russell King 
Signed-off-by: Greg Kroah-Hartman

mmc: vub300: fix type of firmware_rom_wait_states module parameter

2012-01-06T22:13:52+00:00

commit 61074287c2965edf0fc75b54ae8f4ce99f182669 upstream.

You didn't mean this to be a bool.

Signed-off-by: Rusty Russell 
Acked-by: Tony Olech 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: mxcmmc: fix falling back to PIO

2011-12-21T20:57:39+00:00

commit e58f516ff4730c4047c3f104b061f7a03e9a263c upstream.

When we can't configure the dma channel we want to fall
back to PIO. We do this by setting host->do_dma to zero.
This does not work as do_dma is used to see whether dma
can be used for the current transfer. Instead, we have
to set host->dma to NULL.

Signed-off-by: Sascha Hauer 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: core: ext_csd.raw_* used in comparison but never set

2011-11-11T17:35:23+00:00

commit 5238acbe36dd5100fb6b035a995ae5fc89dd0708 upstream.

f39b2dd9d ("mmc: core: Bus width testing needs to handle suspend/resume")
added code to only compare read-only ext_csd fields in bus width testing
code, yet it's comparing some fields that are never set.

The affected fields are ext_csd.raw_erased_mem_count and
ext_csd.raw_partition_support.

Signed-off-by: Andrei Warkentin 
Acked-by: Philip Rakity 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: core: Fix hangs related to insert/remove of cards

2011-11-11T17:35:22+00:00

commit 7f7e4129c23f0419257184dff6fec89d2d5a8964 upstream.

During a rescan operation mmc_attach(sd|mmc|sdio) functions are
called. The error handling in these function can trigger a detach
of the bus, which also meant a power off. This is not notified by
the rescan operation which then continues to the next attach function.

If a power off has been done, the framework must never send any
new commands to the host driver, without first doing a new power up.
This will most likely trigger any host driver to hang.

Moving power off out of detach and instead handle power off
separately when it is actually needed, solves the issue.

Signed-off-by: Ulf Hansson 
Acked-by: Linus Walleij 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: mxs-mmc: fix clock rate setting

2011-10-16T21:14:54+00:00

commit d982dcdc4e64eb1881df44b0035a8268bf1ab067 upstream.

Fix clock rate setting in the mxs-mmc driver. Previously, if div2 was 0
then the value for TIMING_CLOCK_RATE would have been 255 instead of 0.
The limits for div1 (TIMING_CLOCK_DIVIDE) and div2 (TIMING_CLOCK_RATE+1)
were also not correctly defined.

Can easily be reproduced on mx23evk: default clock for high speed sdio
cards is 50 MHz. With a SSP_CLK of 28.8 MHz default), this resulted in
an actual clock rate of about 56 kHz.  Tested on mx23evk.

Signed-off-by: Koen Beel 
Reviewed-by: Wolfram Sang 
Signed-off-by: Chris Ball 
Signed-off-by: Wolfram Sang 
Signed-off-by: Greg Kroah-Hartman