mmc: sh_mmcif: Support MMC_SLEEP_AWAKE command (7541ca98) · Commits · 戴 / test

The MMC_SLEEP_AWAKE and SD_IO_SEND_OP_COND commands share the same opcode. SD_IO_SEND_OP_COND isn't supported by the SH MMCIF, but MMC_SLEEP_AWAKE is. Discriminate between the two commands using the command flags, and reject SD_IO_SEND_OP_COND only. Signed-off-by:

Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by:

Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by:

Chris Ball <cjb@laptop.org>

drivers/mmc/host/sh_mmcif.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -892,21 +892,15 @@ static void sh_mmcif_request(struct mmc_host mmc, struct mmc_request mrq)

		switch (mrq->cmd->opcode) {
		/* MMCIF does not support SD/SDIO command */
		case SD_IO_SEND_OP_COND:
		case MMC_APP_CMD:
		host->state = STATE_IDLE;
		mrq->cmd->error = -ETIMEDOUT;
		mmc_request_done(mmc, mrq);
		return;
		case MMC_SLEEP_AWAKE: /* = SD_IO_SEND_OP_COND (5) */
		case MMC_SEND_EXT_CSD: /* = SD_SEND_IF_COND (8) */
		if (!mrq->data) {
		/* send_if_cond cmd (not support) */
		if ((mrq->cmd->flags & MMC_CMD_MASK) != MMC_CMD_BCR)
		break;
		case MMC_APP_CMD:
		host->state = STATE_IDLE;
		mrq->cmd->error = -ETIMEDOUT;
		mmc_request_done(mmc, mrq);
		return;
		}
		break;
		default:
		break;
		}

Admin message