linux-stable.git/drivers/mmc, branch linux-2.6.37.y

mmc: sdio: remember new card RCA when redetecting card

2011-03-23T19:50:46+00:00

commit 0aab3995485b8a994bf29a995a008c9ea4a28054 upstream.

During redetection of a SDIO card, a request for a new card RCA
was submitted to the card, but was then overwritten by the old RCA.
This caused the card to be deselected instead of selected when using
the incorrect RCA.  This bug's been present since the "oldcard"
handling was introduced in 2.6.32.

Signed-off-by: Stefan Nilsson XK 
Reviewed-by: Ulf Hansson 
Reviewed-by: Pawel Wieczorkiewicz 
Signed-off-by: Linus Walleij 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: sdhci: Add Ricoh e823 PCI ID

2011-03-23T19:50:45+00:00

commit 5fd11c0754fa069b6aba64b65734aa2fb193552d upstream.

Signed-off-by: Manoj Iyer 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: bfin_sdh: fix alloc size for private data

2011-02-17T23:14:36+00:00

commit a34650f0f1ca589cda09c48cb62baf15e680a247 upstream.

The bfin_sdh driver allocates the wrong size for the private data
in the mmc_host.  The first parameter of mmc_alloc_host should be
the size of the local driver struct rather than the common mmc_host.

Signed-off-by: Sonic Zhang 
Signed-off-by: Mike Frysinger 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: Fix re-probing with PM_POST_RESTORE notification

2010-12-21T19:46:49+00:00

In the error-path where PM notifies PM_POST_RESTORE, the rescan-blockage
should be cleared as well.  Otherwise it'll be never re-probed.

Also, as a bonus, this fixes a bug in S4 with user-mode suspend in the
current code, as it sends PM_POST_RESTORE instead of
PM_POST_HIBERNATION wrongly.

Cc: 
Signed-off-by: Takashi Iwai 
Signed-off-by: Chris Ball

mmc: atmel-mci: fix multiblock SDIO transfers

2010-12-21T19:46:48+00:00

Based on report made by Yauhen in:
"MMC: Fix multiblock SDIO transfers in AT91 MCI" patch,
I report those changes to the brother driver: atmel-mci.

So, this patch sets SDIO transfer types: SDIO block and SDIO byte
transfers instead of using ordinary MMC block transfers.
It is checking opcode for SDIO CMD53 and setting transfer
type in MCI_CMDR register properly.

Reported-by: Yauhen Kharuzhy 
Cc: 
Signed-off-by: Nicolas Ferre 
Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Signed-off-by: Chris Ball

mmc: at91_mci: fix multiblock SDIO transfers

2010-12-21T19:46:32+00:00

The AT91 MCI has special SDIO transfer types: SDIO block and SDIO byte
transfers, but at91_mci driver doesn't use them and handles all SDIO
transfers as ordinary MMC block transfers. This causes problems for
multiple-block SDIO transfers (in particular for 256-bytes blocks).

Fix this situation by checking the opcode for SDIO CMD53 and setting
the transfer type in the AT91_MCI_CMDR register properly.

This patch was tested with libertas SDIO driver: problem with TX
timeouts on big packets was eliminated.

Signed-off-by: Yauhen Kharuzhy 
Cc: 
Signed-off-by: Nicolas Ferre 
Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Signed-off-by: Chris Ball

mmc: sdhci: 8-bit bus width changes

2010-11-22T20:12:04+00:00

We now:
 * check for a v3 controller before setting 8-bit bus width
 * offer a callback for platform code to switch to 8-bit mode, which
   allows non-v3 controllers to support it
 * rely on mmc->caps |= MMC_CAP_8_BIT_DATA; in platform code to specify
   that the board designers have indeed brought out all the pins for
   8-bit to the slot.

We were previously relying only on whether the *controller* supported
8-bit, which doesn't tell us anything about the pin configuration in
the board design.

This fixes the MMC card regression reported by Maxim Levitsky here:
   http://thread.gmane.org/gmane.linux.kernel.mmc/4336
by no longer assuming that 8-bit works by default.

Signed-off-by: Philip Rakity 
Tested-by: Giuseppe Cavallaro 
Signed-off-by: Chris Ball

mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD

2010-11-19T22:07:01+00:00

Some board/card/host configurations are not capable of powering off the
card after boot.

To support such configurations, and to allow smoother transition to
runtime PM behavior, MMC_CAP_POWER_OFF_CARD is added, so hosts need to
explicitly indicate whether it's OK to power off their cards after boot.

SDIO core will enable runtime PM for a card only if that cap is set.
As a result, the card will be powered down after boot, and will only
be powered up again when a driver is loaded (and then it's up to the
driver to decide whether power will be kept or not).

This will prevent sdio_bus_probe() failures with setups that do not
support powering off the card.

Reported-and-tested-by: Daniel Drake 
Reported-and-tested-by: Arnd Hannemann 
Signed-off-by: Ohad Ben-Cohen 
Signed-off-by: Chris Ball

mmc: sdio: fix nasty oops in mmc_sdio_detect

2010-11-19T22:06:52+00:00

Power off the card in mmc_sdio_detect __before__ a potential error
handler, which completely removes the card, executes, and only if the
card was successfully powered on beforehand.

While we're at it, use the _sync variant of the runtime PM put API, in
order to ensure that the card is left powered off in case an error
occurred, and the card is going to be removed.

Reproduced and tested on the OLPC XO-1.5.

Reported-by: Daniel Drake 
Signed-off-by: Ohad Ben-Cohen 
Signed-off-by: Chris Ball

mmc: omap4: hsmmc: Fix improper card detection while booting

2010-11-18T03:37:44+00:00

While booting OMAP4 ES2.0 boards, cards on MMC1 and MMC2 controllers
are not getting detected sometimes.

During reset of command/data line, wrong pointer to base address
was passed while read operation to SYSCTL register, thus impacting
the updated reset logic.

Passing the correct base address fixes the issue.

Signed-off-by: Kishore Kadiyala 
Acked-by: Felipe Balbi 
Acked-by: Madhusudhan Chikkature 
Acked-by: Tony Lindgren 
Signed-off-by: Chris Ball