Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1ebe384 authored by Jarkko Lavinen's avatar Jarkko Lavinen Committed by Linus Torvalds
Browse files

mmc: add mmc card sleep and awake support 



Add support for the new MMC command SLEEP_AWAKE.

Signed-off-by: default avatarJarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Acked-by: default avatarMatt Fleming <matt@console-pimps.org>
Cc: Ian Molton <ian@mnementh.co.uk>
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com>
Cc: Pierre Ossman <pierre@ossman.eu>
Cc: Philip Langdale <philipl@overt.org>
Cc: "Madhusudhan" <madhu.cr@ti.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent eae1aeee

drivers/mmc/core/core.c

+40 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,46 @@ void mmc_power_restore_host(struct mmc_host *host) 
}

EXPORT_SYMBOL(mmc_power_restore_host);



int mmc_card_awake(struct mmc_host *host)

{

	int err = -ENOSYS;



	mmc_bus_get(host);



	if (host->bus_ops && !host->bus_dead && host->bus_ops->awake)

		err = host->bus_ops->awake(host);



	mmc_bus_put(host);



	return err;

}

EXPORT_SYMBOL(mmc_card_awake);



int mmc_card_sleep(struct mmc_host *host)

{

	int err = -ENOSYS;



	mmc_bus_get(host);



	if (host->bus_ops && !host->bus_dead && host->bus_ops->awake)

		err = host->bus_ops->sleep(host);



	mmc_bus_put(host);



	return err;

}

EXPORT_SYMBOL(mmc_card_sleep);



int mmc_card_can_sleep(struct mmc_host *host)

{

	struct mmc_card *card = host->card;



	if (card && mmc_card_mmc(card) && card->ext_csd.rev >= 3)

		return 1;

	return 0;

}

EXPORT_SYMBOL(mmc_card_can_sleep);



#ifdef CONFIG_PM



/**

drivers/mmc/core/core.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#define MMC_CMD_RETRIES        3



struct mmc_bus_ops {

	int (*awake)(struct mmc_host *);

	int (*sleep)(struct mmc_host *);

	void (*remove)(struct mmc_host *);

	void (*detect)(struct mmc_host *);

	void (*suspend)(struct mmc_host *);

drivers/mmc/core/mmc.c

+49 −5
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static int mmc_read_ext_csd(struct mmc_card *card) 
{

	int err;

	u8 *ext_csd;

	unsigned int ext_csd_struct;



	BUG_ON(!card);
@@ -207,16 +206,16 @@ static int mmc_read_ext_csd(struct mmc_card *card) 
		goto out;

	}



	ext_csd_struct = ext_csd[EXT_CSD_REV];

	if (ext_csd_struct > 3) {

	card->ext_csd.rev = ext_csd[EXT_CSD_REV];

	if (card->ext_csd.rev > 3) {

		printk(KERN_ERR "%s: unrecognised EXT_CSD structure "

			"version %d\n", mmc_hostname(card->host),

			ext_csd_struct);

			card->ext_csd.rev);

		err = -EINVAL;

		goto out;

	}



	if (ext_csd_struct >= 2) {

	if (card->ext_csd.rev >= 2) {

		card->ext_csd.sectors =

			ext_csd[EXT_CSD_SEC_CNT + 0] << 0 |

			ext_csd[EXT_CSD_SEC_CNT + 1] << 8 |
@@ -241,6 +240,15 @@ static int mmc_read_ext_csd(struct mmc_card *card) 
		goto out;

	}



	if (card->ext_csd.rev >= 3) {

		u8 sa_shift = ext_csd[EXT_CSD_S_A_TIMEOUT];



		/* Sleep / awake timeout in 100ns units */

		if (sa_shift > 0 && sa_shift <= 0x17)

			card->ext_csd.sa_timeout =

					1 << ext_csd[EXT_CSD_S_A_TIMEOUT];

	}



out:

	kfree(ext_csd);
@@ -557,9 +565,41 @@ static void mmc_power_restore(struct mmc_host *host) 
	mmc_release_host(host);

}



static int mmc_sleep(struct mmc_host *host)

{

	struct mmc_card *card = host->card;

	int err = -ENOSYS;



	if (card && card->ext_csd.rev >= 3) {

		err = mmc_card_sleepawake(host, 1);

		if (err < 0)

			pr_debug("%s: Error %d while putting card into sleep",

				 mmc_hostname(host), err);

	}



	return err;

}



static int mmc_awake(struct mmc_host *host)

{

	struct mmc_card *card = host->card;

	int err = -ENOSYS;



	if (card && card->ext_csd.rev >= 3) {

		err = mmc_card_sleepawake(host, 0);

		if (err < 0)

			pr_debug("%s: Error %d while awaking sleeping card",

				 mmc_hostname(host), err);

	}



	return err;

}



#ifdef CONFIG_MMC_UNSAFE_RESUME



static const struct mmc_bus_ops mmc_ops = {

	.awake = mmc_awake,

	.sleep = mmc_sleep,

	.remove = mmc_remove,

	.detect = mmc_detect,

	.suspend = mmc_suspend,
@@ -575,6 +615,8 @@ static void mmc_attach_bus_ops(struct mmc_host *host) 
#else



static const struct mmc_bus_ops mmc_ops = {

	.awake = mmc_awake,

	.sleep = mmc_sleep,

	.remove = mmc_remove,

	.detect = mmc_detect,

	.suspend = NULL,
@@ -583,6 +625,8 @@ static const struct mmc_bus_ops mmc_ops = { 
};



static const struct mmc_bus_ops mmc_ops_unsafe = {

	.awake = mmc_awake,

	.sleep = mmc_sleep,

	.remove = mmc_remove,

	.detect = mmc_detect,

	.suspend = mmc_suspend,

drivers/mmc/core/mmc_ops.c

+36 −0
Original line number Diff line number Diff line
@@ -57,6 +57,42 @@ int mmc_deselect_cards(struct mmc_host *host) 
	return _mmc_select_card(host, NULL);

}



int mmc_card_sleepawake(struct mmc_host *host, int sleep)

{

	struct mmc_command cmd;

	struct mmc_card *card = host->card;

	int err;



	if (sleep)

		mmc_deselect_cards(host);



	memset(&cmd, 0, sizeof(struct mmc_command));



	cmd.opcode = MMC_SLEEP_AWAKE;

	cmd.arg = card->rca << 16;

	if (sleep)

		cmd.arg |= 1 << 15;



	cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;

	err = mmc_wait_for_cmd(host, &cmd, 0);

	if (err)

		return err;



	/*

	 * If the host does not wait while the card signals busy, then we will

	 * will have to wait the sleep/awake timeout.  Note, we cannot use the

	 * SEND_STATUS command to poll the status because that command (and most

	 * others) is invalid while the card sleeps.

	 */

	if (!(host->caps & MMC_CAP_WAIT_WHILE_BUSY))

		mmc_delay(DIV_ROUND_UP(card->ext_csd.sa_timeout, 10000));



	if (!sleep)

		err = mmc_select_card(card);



	return err;

}



int mmc_go_idle(struct mmc_host *host)

{

	int err;

drivers/mmc/core/mmc_ops.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ int mmc_send_status(struct mmc_card *card, u32 *status); 
int mmc_send_cid(struct mmc_host *host, u32 *cid);

int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp);

int mmc_spi_set_crc(struct mmc_host *host, int use_crc);

int mmc_card_sleepawake(struct mmc_host *host, int sleep);



#endif