Commit a44f7cb9 authored Nov 26, 2018 by Wolfram Sang Committed by Ulf Hansson Dec 04, 2018

mmc: core: use mrq->sbc when sending CMD23 for RPMB



When sending out CMD23 in the blk preparation, the comment there
rightfully says:

	 * However, it is not sufficient to just send CMD23,
	 * and avoid the final CMD12, as on an error condition
	 * CMD12 (stop) needs to be sent anyway. This, coupled
	 * with Auto-CMD23 enhancements provided by some
	 * hosts, means that the complexity of dealing
	 * with this is best left to the host. If CMD23 is
	 * supported by card and host, we'll fill sbc in and let
	 * the host deal with handling it correctly.

Let's do this behaviour for RPMB as well, and not send CMD23
independently. Otherwise IP cores (like Renesas SDHI) may timeout
because of automatic CMD23/CMD12 handling.

Reported-by: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Clément Péron <peron.clem@gmail.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 25956467

drivers/mmc/core/block.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -472,7 +472,7 @@ out:
		static int __mmc_blk_ioctl_cmd(struct mmc_card card, struct mmc_blk_data md,
		struct mmc_blk_ioc_data *idata)
		{
		struct mmc_command cmd = {};
		struct mmc_command cmd = {}, sbc = {};
		struct mmc_data data = {};
		struct mmc_request mrq = {};
		struct scatterlist sg;
		@@ -550,10 +550,15 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card card, struct mmc_blk_data md,
		}

		if (idata->rpmb) {
		err = mmc_set_blockcount(card, data.blocks,
		idata->ic.write_flag & (1 << 31));
		if (err)
		return err;
		sbc.opcode = MMC_SET_BLOCK_COUNT;
		/*
		* We don't do any blockcount validation because the max size
		* may be increased by a future standard. We just copy the
		* 'Reliable Write' bit here.
		*/
		sbc.arg = data.blocks \| (idata->ic.write_flag & BIT(31));
		sbc.flags = MMC_RSP_R1 \| MMC_CMD_AC;
		mrq.sbc = &sbc;
		}

		if ((MMC_EXTRACT_INDEX_FROM_ARG(cmd.arg) == EXT_CSD_SANITIZE_START) &&

Admin message