linux-stable.git/drivers/mmc/core, branch linux-2.6.36.y

mmc: Fix re-probing with PM_POST_RESTORE notification

2011-01-07T21:58:41+00:00

commit 274476f8fe0b6ac9bac542cc39de12c3dd0f43f6 upstream.

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.

Signed-off-by: Takashi Iwai 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: fix rmmod race for hosts using card-detection polling

2010-12-09T21:33:18+00:00

commit d9bcbf343ec63e1104b5276195888ee06b4d086f upstream.

MMC hosts that poll for card detection by defining the MMC_CAP_NEEDS_POLL
flag have a race on rmmod, where the delayed work is cancelled without
waiting for completed polling. To prevent this a _sync version of the work
cancellation has to be used.

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

mmc: sdio: fix SDIO suspend/resume regression

2010-10-15T16:54:55+00:00

Fix SDIO suspend/resume regression introduced by 4c2ef25fe0b "mmc: fix
all hangs related to mmc/sd card insert/removal during suspend/resume":

  PM: Syncing filesystems ... done.
  Freezing user space processes ... (elapsed 0.01 seconds) done.
  Freezing remaining freezable tasks ... (elapsed 0.01 seconds) done.
  Suspending console(s) (use no_console_suspend to debug)
  pm_op(): platform_pm_suspend+0x0/0x5c returns -38
  PM: Device pxa2xx-mci.0 failed to suspend: error -38
  PM: Some devices failed to suspend

4c2ef25fe0b moved the card removal/insertion mechanism out of MMC's
suspend/resume path and into pm notifiers (mmc_pm_notify), and that
broke SDIO's expectation that mmc_suspend_host() will remove the card,
and squash the error, in case -ENOSYS is returned from the bus suspend
handler (mmc_sdio_suspend() in this case).

mmc_sdio_suspend() is using this whenever at least one of the card's SDIO
function drivers does not have suspend/resume handlers - in that case
it is agreed to force removal of the entire card.

This patch fixes this regression by trivially bringing back that part of
mmc_suspend_host(), which was removed by 4c2ef25fe0b.

Reported-and-tested-by: Sven Neumann 
Signed-off-by: Ohad Ben-Cohen 
Cc: Maxim Levitsky 
Cc: 
Acked-by: Nicolas Pitre 
Signed-off-by: Chris Ball

mmc: avoid getting CID on SDIO-only cards

2010-09-10T01:57:22+00:00

The introduction of support for SD combo cards breaks the initialization
of all CSR SDIO chips.  The GO_IDLE (CMD0) in mmc_sd_get_cid() causes CSR
chips to be reset (this is non-standard behavior).

When initializing an SDIO card check for a combo card by using the memory
present bit in the R4 response to IO_SEND_OP_COND (CMD5).  This avoids the
call to mmc_sd_get_cid() on an SDIO-only card.

Signed-off-by: David Vrabel 
Acked-by: Michal Mirolaw 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: build fix: mmc_pm_notify is only available with CONFIG_PM=y

2010-08-18T16:34:05+00:00

This fixes a build breakage introduced by commit 4c2ef25fe0b8 ("mmc: fix
all hangs related to mmc/sd card insert/removal during suspend/resume")

Cc: David Brownell 
Cc: Alan Stern 
Cc: linux-mmc@vger.kernel.org
Cc: Andrew Morton 
Signed-off-by: Uwe Kleine-König 
Acked-by: Kukjin Kim 
Acked-by: Maxim Levitsky 
Acked-by: Randy Dunlap 
Signed-off-by: Linus Torvalds

mmc: add erase, secure erase, trim and secure trim operations

2010-08-12T15:43:30+00:00

SD/MMC cards tend to support an erase operation.  In addition, eMMC v4.4
cards can support secure erase, trim and secure trim operations that are
all variants of the basic erase command.

SD/MMC device attributes "erase_size" and "preferred_erase_size" have been
added.

"erase_size" is the minimum size, in bytes, of an erase operation.  For
MMC, "erase_size" is the erase group size reported by the card.  Note that
"erase_size" does not apply to trim or secure trim operations where the
minimum size is always one 512 byte sector.  For SD, "erase_size" is 512
if the card is block-addressed, 0 otherwise.

SD/MMC cards can erase an arbitrarily large area up to and
including the whole card.  When erasing a large area it may
be desirable to do it in smaller chunks for three reasons:

    1. A single erase command will make all other I/O on the card
       wait.  This is not a problem if the whole card is being erased, but
       erasing one partition will make I/O for another partition on the
       same card wait for the duration of the erase - which could be a
       several minutes.

    2. To be able to inform the user of erase progress.

    3. The erase timeout becomes too large to be very useful.
       Because the erase timeout contains a margin which is multiplied by
       the size of the erase area, the value can end up being several
       minutes for large areas.

"erase_size" is not the most efficient unit to erase (especially for SD
where it is just one sector), hence "preferred_erase_size" provides a good
chunk size for erasing large areas.

For MMC, "preferred_erase_size" is the high-capacity erase size if a card
specifies one, otherwise it is based on the capacity of the card.

For SD, "preferred_erase_size" is the allocation unit size specified by
the card.

"preferred_erase_size" is in bytes.

Signed-off-by: Adrian Hunter 
Acked-by: Jens Axboe 
Cc: Kyungmin Park 
Cc: Madhusudhan Chikkature 
Cc: Christoph Hellwig 
Cc: Ben Gardiner 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

sdio: allow non-standard SDIO cards

2010-08-11T15:59:04+00:00

There are some chips (like TI WL12xx series) that can be interfaced over
SDIO but don't support the SDIO specification, meaning that they are
missing CIA (Common I/O Area) with all it's registers.  Current Linux SDIO
implementation relies on those registers to identify and configure the
card, so non-standard cards can not function and cause lots of warnings
from the core when it reads invalid data from non-existent registers.

After this patch, init_card() host callback can now set new quirk
MMC_QUIRK_NONSTD_SDIO, which means that SDIO core should not try to access
any standard SDIO registers and rely on init_card() to fill all SDIO
structures instead.  As those cards are usually embedded chips, all the
required information can be obtained from machine board files by the host
driver when it's called through init_card() callback.

Signed-off-by: Grazvydas Ignotas 
Cc: Adrian Hunter 
Cc: Tony Lindgren 
Cc: Bob Copeland 
Cc: Kalle Valo 
Cc: Madhusudhan Chikkature 
Cc: Kishore Kadiyala 
Cc: Russell King 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: only set blockaddressed for > 2GiB cards

2010-08-11T15:59:03+00:00

A non-zero value of SEC_COUNT does not indicate that the card is sector
addressed.  According to the MMC specification, cards with a density
greater than 2GiB are sector addressed.

Acked-by: Linus Walleij 
Signed-off-by: Hanumath Prasad 
Signed-off-by: Rabin Vincent 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume

2010-08-11T15:59:03+00:00

If you don't use CONFIG_MMC_UNSAFE_RESUME, as soon as you attempt to
suspend, the card will be removed, therefore this patch doesn't change the
behavior of this option.

However the removal will be done by pm notifier, which runs while
userspace is still not frozen and thus can freely use del_gendisk, without
the risk of deadlock which would happen otherwise.

Card detect workqueue is now disabled while userspace is frozen, Therefore
if you do use CONFIG_MMC_UNSAFE_RESUME, and remove the card during
suspend, the removal will be detected as soon as userspace is unfrozen,
again at the moment it is safe to call del_gendisk.

Tested with and without CONFIG_MMC_UNSAFE_RESUME with suspend and hibernate.

[akpm@linux-foundation.org: clean up function prototype]
[akpm@linux-foundation.org: fix CONFIG_PM-n linkage, small cleanups]
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Maxim Levitsky 
Cc: David Brownell 
Cc: Alan Stern 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: implement SD-combo (IO+mem) support

2010-08-11T15:59:03+00:00

Signed-off-by: Michal Miroslaw 
Cc: Adrian Hunter 
Cc: Chris Ball 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds