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

Commit cc4d04be authored by Ken Sumrall's avatar Ken Sumrall Committed by Ulf Hansson
Browse files

mmc: block: improve logging of handling emmc timeouts 



Add some logging to make it clear just how the emmc timeout
was handled.

Signed-off-by: default avatarKen Sumrall <ksumrall@android.com>
[AmitP: cherry-picked this Android patch from aosp
        common kernel android-4.4]
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ded97e0b

drivers/mmc/card/block.c

+8 −2
Original line number Diff line number Diff line
@@ -948,16 +948,22 @@ static int mmc_blk_cmd_error(struct request *req, const char *name, int error, 
			req->rq_disk->disk_name, "timed out", name, status);



		/* If the status cmd initially failed, retry the r/w cmd */

		if (!status_valid)

		if (!status_valid) {

			pr_err("%s: status not valid, retrying timeout\n",

				req->rq_disk->disk_name);

			return ERR_RETRY;

		}



		/*

		 * If it was a r/w cmd crc error, or illegal command

		 * (eg, issued in wrong state) then retry - we should

		 * have corrected the state problem above.

		 */

		if (status & (R1_COM_CRC_ERROR | R1_ILLEGAL_COMMAND))

		if (status & (R1_COM_CRC_ERROR | R1_ILLEGAL_COMMAND)) {

			pr_err("%s: command error, retrying timeout\n",

				req->rq_disk->disk_name);

			return ERR_RETRY;

		}



		/* Otherwise abort the command */

		return ERR_ABORT;