evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mmc: card: Requeue the request if it fails during issuing"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-27 16:05:55 -08:00 • committed by Gerrit - the friendly Code Review server
commit b246b38b90
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/mmc/card/block.c
View file

@ -3170,6 +3170,16 @@ static struct mmc_cmdq_req *mmc_blk_cmdq_rw_prep(
return &mqrq->cmdq_req; return &mqrq->cmdq_req;
} }
static void mmc_blk_cmdq_requeue_rw_rq(struct mmc_queue *mq,
struct request *req)
{
struct mmc_card *card = mq->card;
struct mmc_host *host = card->host;
blk_requeue_request(req->q, req);
mmc_put_card(host->card);
}
static int mmc_blk_cmdq_issue_rw_rq(struct mmc_queue *mq, struct request *req) static int mmc_blk_cmdq_issue_rw_rq(struct mmc_queue *mq, struct request *req)
{ {
struct mmc_queue_req *active_mqrq; struct mmc_queue_req *active_mqrq;
@ -3217,6 +3227,15 @@ static int mmc_blk_cmdq_issue_rw_rq(struct mmc_queue *mq, struct request *req)
wait_event_interruptible(ctx->queue_empty_wq, wait_event_interruptible(ctx->queue_empty_wq,
(!ctx->active_reqs)); (!ctx->active_reqs));
if (ret) {
/* clear pending request */
WARN_ON(!test_and_clear_bit(req->tag,
&host->cmdq_ctx.data_active_reqs));
WARN_ON(!test_and_clear_bit(req->tag,
&host->cmdq_ctx.active_reqs));
mmc_cmdq_clk_scaling_stop_busy(host, true, false);
}
return ret; return ret;
} }
@ -4042,6 +4061,13 @@ static int mmc_blk_cmdq_issue_rq(struct mmc_queue *mq, struct request *req)
ret = mmc_blk_cmdq_issue_flush_rq(mq, req); ret = mmc_blk_cmdq_issue_flush_rq(mq, req);
} else { } else {
ret = mmc_blk_cmdq_issue_rw_rq(mq, req); ret = mmc_blk_cmdq_issue_rw_rq(mq, req);
/*
* If issuing of the request fails with eitehr EBUSY or
* EAGAIN error, re-queue the request.
* This case would occur with ICE calls.
*/
if (ret == -EBUSY || ret == -EAGAIN)
mmc_blk_cmdq_requeue_rw_rq(mq, req);
} }
} }