Commit ed633033 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Add helpers for the auto-CMD23 flag 



Add 2 helper functions to make the use of the auto-CMD23 flag more
readable.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarBaolin Wang <baolin.wang7@gmail.com>
Link: https://lore.kernel.org/r/20200412090349.1607-2-adrian.hunter@intel.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 9d624f4f

drivers/mmc/host/sdhci.c

+15 −3
Original line number Diff line number Diff line
@@ -1350,13 +1350,25 @@ static inline bool sdhci_auto_cmd12(struct sdhci_host *host, 
	       !mrq->cap_cmd_during_tfr;

}



static inline bool sdhci_auto_cmd23(struct sdhci_host *host,

				    struct mmc_request *mrq)

{

	return mrq->sbc && (host->flags & SDHCI_AUTO_CMD23);

}



static inline bool sdhci_manual_cmd23(struct sdhci_host *host,

				      struct mmc_request *mrq)

{

	return mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23);

}



static inline void sdhci_auto_cmd_select(struct sdhci_host *host,

					 struct mmc_command *cmd,

					 u16 *mode)

{

	bool use_cmd12 = sdhci_auto_cmd12(host, cmd->mrq) &&

			 (cmd->opcode != SD_IO_RW_EXTENDED);

	bool use_cmd23 = cmd->mrq->sbc && (host->flags & SDHCI_AUTO_CMD23);

	bool use_cmd23 = sdhci_auto_cmd23(host, cmd->mrq);

	u16 ctrl2;



	/*
@@ -1416,7 +1428,7 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, 
	if (mmc_op_multi(cmd->opcode) || data->blocks > 1) {

		mode = SDHCI_TRNS_BLK_CNT_EN | SDHCI_TRNS_MULTI;

		sdhci_auto_cmd_select(host, cmd, &mode);

		if (cmd->mrq->sbc && (host->flags & SDHCI_AUTO_CMD23))

		if (sdhci_auto_cmd23(host, cmd->mrq))

			sdhci_writel(host, cmd->mrq->sbc->arg, SDHCI_ARGUMENT2);

	}
@@ -2054,7 +2066,7 @@ void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) 
		mrq->cmd->error = -ENOMEDIUM;

		sdhci_finish_mrq(host, mrq);

	} else {

		if (mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23))

		if (sdhci_manual_cmd23(host, mrq))

			sdhci_send_command(host, mrq->sbc);

		else

			sdhci_send_command(host, mrq->cmd);