linux.git/drivers/mmc/core, branch v2.6.33

mmc: allow for MMC v4.4

2010-01-11T17:34:06+00:00

JEDEC eMMC specification version 4.4 (MMCA 4.4) defines Extended CSD
structure versions up to 5.

Signed-off-by: Adrian Hunter 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

sdio: initialise SDIO functions and update card->sdio_funcs in lockstep

2009-12-17T23:45:31+00:00

Daniel Drake noticed a crash in the error path of mmc_attach_sdio().  This
bug is discussed at http://dev.laptop.org/ticket/9707.

BUG: unable to handle kernel paging request at 6b6b6c57
IP: [] sdio_remove_func+0x9/0x27
Call Trace:
[] ? mmc_sdio_remove+0x34/0x65
[] ? mmc_attach_sdio+0x217/0x240
[] ? mmc_rescan+0x1a2/0x20f
[] ? worker_thread+0x156/0x1e

We need to accurately track how many SDIO functions have been initialised
(and keep card->sdio_funcs in sync) so that we don't try to remove more
functions than we initialised if we hit the error path in
mmc_attach_sdio().

Without this patch if we hit the error path in mmc_attach_sdio() we run
the risk of deferencing invalid memory in sdio_remove_func(), leading to a
crash.

Signed-off-by: Matt Fleming 
Cc: Daniel Drake 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

sdio: fix reference counting in sdio_remove_func()

2009-12-17T23:45:31+00:00

sdio_remove_func() needs to be more careful about reference counting.  It
can be called in error paths where sdio_add_func() has never been called
e.g.  mmc_attach_sdio error path --> mmc_sdio_remove --> sdio_remove_func

Signed-off-by: Daniel Drake 
Reviewed-by: Matt Fleming 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: add module parameter to set whether cards are assumed removable

2009-12-15T16:53:35+00:00

Some people run general-purpose distribution kernels on netbooks with
a card that is physically non-removable or logically non-removable
(e.g. used for /home) and cannot be cleanly unmounted during suspend.
Add a module parameter to set whether cards are assumed removable or
non-removable, with the default set by CONFIG_MMC_UNSAFE_RESUME.

In general, it is not possible to tell whether a card present in an MMC
slot after resume is the same that was there before suspend.  So there are
two possible behaviours, each of which will cause data loss in some cases:

CONFIG_MMC_UNSAFE_RESUME=n (default): Cards are assumed to be removed
during suspend.  Any filesystem on them must be unmounted before suspend;
otherwise, buffered writes will be lost.

CONFIG_MMC_UNSAFE_RESUME=y: Cards are assumed to remain present during
suspend.  They must not be swapped during suspend; otherwise, buffered
writes will be flushed to the wrong card.

Currently the choice is made at compile time and this allows that to be
overridden at module load time.

Signed-off-by: Ben Hutchings 
Cc: Wouter van Heyst 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

sdio: rework cis tuple parsing

2009-12-15T16:53:34+00:00

Rework the current CIS tuple parsing code, reusing the existing
infrastructure and providing an easy way to add new CISTPL_FUNCE parsers
by TPLFE_TYPE.

Valid known CIS tuples are now silently queued for the SDIO function
driver when not parsed/processed (-EILSEQ) by the SDIO core.  Unknown CIS
tuples (-ENOENT) are queued too for the SDIO function driver without
aborting the initialization, but emit a warning in the kernel log.

CISTPL_FUNCE tuples can be "whitelisted" now by adding a matching entry to
the cis_tpl_funce_list table.

Signed-off-by: Albert Herranz 
Acked-by: Pierre Ossman 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: sdio: don't require CISTPL_VERS_1 to contain 4 strings

2009-10-08T14:36:40+00:00

The PC Card 8.0 specification (vol.  4, section 3.2.10) says the
TPLLV1_INFO field of the CISTPL_VERS_1 tuple must contain 4 strings.  Some
cards don't have all 4 so just parse as many as we can.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: David Vrabel 
Tested-by: Jonathan Cameron 
Tested-by: Bing Zhao 
Cc: Roel Kluin 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

sdio: pass whitelisted cis funce tuples to sdio drivers

2009-10-01T23:11:12+00:00

Some manufacturers provide vendor information in non-vendor specific CIS
tuples.  For example, Broadcom uses an Extended Function tuple to provide
the MAC address on some of their network cards, as in the case of the
Nintendo Wii WLAN daughter card.

This patch allows passing whitelisted FUNCE tuples unknown to the SDIO
core to a matching SDIO driver instead of rejecting them and failing.

Signed-off-by: Albert Herranz 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

const: constify remaining file_operations

2009-10-01T23:11:11+00:00

[akpm@linux-foundation.org: fix KVM]
Signed-off-by: Alexey Dobriyan 
Acked-by: Mike Frysinger 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: make SDIO device/driver struct accessors public

2009-09-23T14:39:38+00:00

Especially with the PM framework, those are quite handy to have in driver
code too.

Signed-off-by: Nicolas Pitre 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mmc: propagate error codes back from bus drivers' suspend/resume methods

2009-09-23T14:39:38+00:00

Especially for SDIO drivers which may have special conditions/errors to
report, it is a good thing to relay the returned error code back to upper
layers.

This also allows for the rationalization of the resume path where code to
"remove" a no-longer-existing or replaced card was duplicated into the
MMC, SD and SDIO bus drivers.

In the SDIO case, if a function suspend method returns an error, then all
previously suspended functions are resumed and the error returned.  An
exception is made for -ENOSYS which the core interprets as "we don't
support suspend so just kick the card out for suspend and return success".

When resuming SDIO cards, the core code only validates the manufacturer
and product IDs to make sure the same kind of card is still present before
invoking functions resume methods.  It's the function driver's
responsibility to perform further tests to confirm that the actual same
card is present (same MAC address, etc.) and return an error otherwise.

Signed-off-by: Nicolas Pitre 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds