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

Commit 94112c0a authored by Sayali Lokhande's avatar Sayali Lokhande
Browse files

mmc: core: Add mmc tracing events in suspend and resume 



Add mmc tracing events in suspend and resume.

Change-Id: I5ca1c3f667003c4b4224b65d2a5db50766b44d75
Signed-off-by: default avatarSayali Lokhande <sayalil@codeaurora.org>
parent fc9fbe34

drivers/mmc/core/mmc.c

+4 −1
Original line number Diff line number Diff line
@@ -2619,6 +2619,7 @@ static int mmc_suspend(struct mmc_host *host) 
	int err;

	ktime_t start = ktime_get();



	MMC_TRACE(host, "%s: Enter\n", __func__);

	err = _mmc_suspend(host, true);

	if (!err) {

		pm_runtime_disable(&host->card->dev);
@@ -2627,6 +2628,7 @@ static int mmc_suspend(struct mmc_host *host) 


	trace_mmc_suspend(mmc_hostname(host), err,

			ktime_to_us(ktime_sub(ktime_get(), start)));

	MMC_TRACE(host, "%s: Exit err: %d\n", __func__, err);

	return err;

}
@@ -2702,6 +2704,7 @@ static int mmc_resume(struct mmc_host *host) 
	int err = 0;

	ktime_t start = ktime_get();



	MMC_TRACE(host, "%s: Enter\n", __func__);

	if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) {

		err = _mmc_resume(host);

		pm_runtime_set_active(&host->card->dev);
@@ -2711,7 +2714,7 @@ static int mmc_resume(struct mmc_host *host) 


	trace_mmc_resume(mmc_hostname(host), err,

			ktime_to_us(ktime_sub(ktime_get(), start)));



	MMC_TRACE(host, "%s: Exit err: %d\n", __func__, err);

	return err;

}

drivers/mmc/core/sd.c

+4 −0
Original line number Diff line number Diff line
@@ -1222,11 +1222,13 @@ static int mmc_sd_suspend(struct mmc_host *host) 
{

	int err;



	MMC_TRACE(host, "%s: Enter\n", __func__);

	err = _mmc_sd_suspend(host);

	if (!err) {

		pm_runtime_disable(&host->card->dev);

		pm_runtime_set_suspended(&host->card->dev);

	}

	MMC_TRACE(host, "%s: Exit err: %d\n", __func__, err);



	return err;

}
@@ -1292,12 +1294,14 @@ static int mmc_sd_resume(struct mmc_host *host) 
{

	int err = 0;



	MMC_TRACE(host, "%s: Enter\n", __func__);

	if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) {

		err = _mmc_sd_resume(host);

		pm_runtime_set_active(&host->card->dev);

		pm_runtime_mark_last_busy(&host->card->dev);

	}

	pm_runtime_enable(&host->card->dev);

	MMC_TRACE(host, "%s: Exit err: %d\n", __func__, err);



	return err;

}

drivers/mmc/core/sdio.c

+4 −1
Original line number Diff line number Diff line
@@ -998,6 +998,7 @@ static int mmc_sdio_pre_suspend(struct mmc_host *host) 
 */

static int mmc_sdio_suspend(struct mmc_host *host)

{

	MMC_TRACE(host, "%s: Enter\n", __func__);

	mmc_claim_host(host);



	if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host))
@@ -1013,7 +1014,7 @@ static int mmc_sdio_suspend(struct mmc_host *host) 
	}



	mmc_release_host(host);



	MMC_TRACE(host, "%s: Exit\n", __func__);

	return 0;

}
@@ -1024,6 +1025,7 @@ static int mmc_sdio_resume(struct mmc_host *host) 
	BUG_ON(!host);

	BUG_ON(!host->card);



	MMC_TRACE(host, "%s: Enter\n", __func__);

	/* Basic card reinitialization. */

	mmc_claim_host(host);
@@ -1079,6 +1081,7 @@ static int mmc_sdio_resume(struct mmc_host *host) 


	host->pm_flags &= ~MMC_PM_KEEP_POWER;

	host->pm_flags &= ~MMC_PM_WAKE_SDIO_IRQ;

	MMC_TRACE(host, "%s: Exit err: %d\n", __func__, err);

	return err;

}