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

Commit 302bddea authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: block: Fix issue with deferred resume when CQ is enabled"

parents 4b466bc3 8b96d7f4

drivers/mmc/card/block.c

+0 −8
Original line number Diff line number Diff line
@@ -3490,10 +3490,6 @@ static int mmc_blk_cmdq_issue_rq(struct mmc_queue *mq, struct request *req) 


	mmc_get_card(card);



#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	if (mmc_bus_needs_resume(card->host))

		mmc_resume_bus(card->host);

#endif

	if (!card->host->cmdq_ctx.active_reqs && mmc_card_doing_bkops(card)) {

		ret = mmc_cmdq_halt(card->host, true);

		if (ret)
@@ -3580,10 +3576,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
		/* claim host only for the first request */

		mmc_get_card(card);



#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	if (mmc_bus_needs_resume(card->host))

		mmc_resume_bus(card->host);

#endif

		if (mmc_card_doing_bkops(host->card)) {

			ret = mmc_stop_bkops(host->card);

			if (ret)

drivers/mmc/core/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1646,10 +1646,6 @@ EXPORT_SYMBOL(mmc_start_req); 
 */

void mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq)

{

#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	if (mmc_bus_needs_resume(host))

		mmc_resume_bus(host);

#endif

	__mmc_start_req(host, mrq);

	mmc_wait_for_req_done(host, mrq);

}
@@ -2046,6 +2042,10 @@ void mmc_get_card(struct mmc_card *card) 
{

	pm_runtime_get_sync(&card->dev);

	mmc_claim_host(card->host);

#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	if (mmc_bus_needs_resume(card->host))

		mmc_resume_bus(card->host);

#endif

}

EXPORT_SYMBOL(mmc_get_card);