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

Commit 2c7676c7 authored by Veerabhadrarao Badiganti's avatar Veerabhadrarao Badiganti Committed by Gerrit - the friendly Code Review server
Browse files

mmc: card: block: Add support for completing cmdq requests with error 



Add support for completing failed cmdq requests with error.

If any cmdq request is failed, we enter into error recovery path and
re-queue the same request. But in some cases (e.g. requests failed due
to invalid crypto configuration) same request shouldn't be re-queued
but should complete the request with error so that the a new requested
would be issued.

In mmc_blk_cmdq_complete_rq(), for a request if error information is
present and flag which indicates to skip error handling is set
then complete that request with error info.

Change-Id: I9c4a446bb27b4d82a0847d0bfb4481b314df479c
Signed-off-by: default avatarVeerabhadrarao Badiganti <vbadigan@codeaurora.org>
parent 83333ef2

drivers/mmc/card/block.c

+12 −1
Original line number Diff line number Diff line
@@ -3544,7 +3544,7 @@ void mmc_blk_cmdq_complete_rq(struct request *rq) 
	else if (mrq->data && mrq->data->error)

		err = mrq->data->error;



	if (err || cmdq_req->resp_err) {

	if ((err || cmdq_req->resp_err) && !cmdq_req->skip_err_handling) {

		pr_err("%s: %s: txfr error(%d)/resp_err(%d)\n",

				mmc_hostname(mrq->host), __func__, err,

				cmdq_req->resp_err);
@@ -3581,6 +3581,17 @@ void mmc_blk_cmdq_complete_rq(struct request *rq) 
		blk_end_request_all(rq, err);

		goto out;

	}

	/*

	 * In case of error, cmdq_req->data.bytes_xfered is set to 0.

	 * If we call blk_end_request() with nr_bytes as 0 then the request

	 * never gets completed. So in case of error, to complete a request

	 * with error we should use blk_end_request_all().

	 */

	if (err && cmdq_req->skip_err_handling) {

		cmdq_req->skip_err_handling = false;

		blk_end_request_all(rq, err);

		goto out;

	}



	blk_end_request(rq, err, cmdq_req->data.bytes_xfered);