mmc: add MMC_CAP_NONREMOVABLE host capability
PATCH 46/232 mmc: add MMC_CAP_NONREMOVABLE host capability
From: Adrian Hunter <[email protected]>
eMMC's are not removable, so unsafe resume is OK always.
To permit this a new host capability MMC_CAP_NONREMOVABLE has been added and suspend / resume updated accordingly.
Signed-off-by Adrian Hunter <[email protected]>
Acked-by Matt Fleming <[email protected]>
Cc Ian Molton <[email protected]>
Cc "Roberto A. Foglietta" <[email protected]>
Cc Jarkko Lavinen <[email protected]>
Cc Denis Karpov <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc Philip Langdale <[email protected]>
Cc "Madhusudhan" <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mmc/core/mmc.c | 41 ++++++++++++++++++++++++++++++------- drivers/mmc/core/sd.c | 41 ++++++++++++++++++++++++++++++------- include/linux/mmc/host.h | 1 3 files changed, 69 insertions(+), 14 deletions(-)
drivers/mmc/core/mmc.c renamed from drivers/mmc/core/mmc.c~mmc-add-mmc_cap_nonremovable-host-capability +34 -7
@@ -507,8 +507,6 @@ static void mmc_detect(struct mmc_host * } } -#ifdef CONFIG_MMC_UNSAFE_RESUME -/* * Suspend callback from host. */
@@ -551,20 +549,49 @@ static void mmc_resume(struct mmc_host * } -#else +#ifdef CONFIG_MMC_UNSAFE_RESUME -#define mmc_suspend NULL -#define mmc_resume NULL +static const struct mmc_bus_ops mmc_ops = { + .remove = mmc_remove, + .detect = mmc_detect, + .suspend = mmc_suspend, + .resume = mmc_resume, +}; -#endif +static void mmc_attach_bus_ops (struct mmc_host *host) +{ +mmc_attach_bus (host, &mmc_ops); +} + +#else static const struct mmc_bus_ops mmc_ops = { .remove = mmc_remove, .detect = mmc_detect, + .suspend =NULL , + .resume =NULL , +}; + +static const struct mmc_bus_ops mmc_ops_unsafe = { + .remove = mmc_remove, + .detect = mmc_detect, .suspend = mmc_suspend, .resume = mmc_resume, }; +static void mmc_attach_bus_ops (struct mmc_host *host) +{ +const struct mmc_bus_ops *bus_ops; + +if (host->caps &MMC_CAP_NONREMOVABLE ) + bus_ops = &mmc_ops_unsafe; +else + bus_ops = &mmc_ops; +mmc_attach_bus (host, bus_ops); +} + +#endif +/* * Starting point for MMC card init. */
@@ -575,7 +602,7 @@ int mmc_attach_mmc(struct mmc_host *hostBUG_ON (!host);WARN_ON (!host->claimed); -mmc_attach_bus (host, &mmc_ops); +mmc_attach_bus_ops (host);/* * We need to get OCR a different way for SPI.
drivers/mmc/core/sd.c renamed from drivers/mmc/core/sd.c~mmc-add-mmc_cap_nonremovable-host-capability +34 -7
69 lines not on this page · raw message
include/linux/mmc/host.h renamed from include/linux/mmc/host.h~mmc-add-mmc_cap_nonremovable-host-capability +1 -0
@@ -148,6 +148,7 @@ struct mmc_host {#define MMC_CAP_NEEDS_POLL (1 << 5)/* Needs polling for card-detection */ #define MMC_CAP_8_BIT_DATA (1 << 6)/* Can the host do 8 bit transfers */ #define MMC_CAP_DISABLE (1 << 7)/* Can the host be disabled */ +#define MMC_CAP_NONREMOVABLE (1 << 8)/* Nonremovable e.g. eMMC */ /* host specific block data */ unsigned int max_seg_size;/* see blk_queue_max_segment_size */
_