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

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

mmc: sdhci: Factor out target_timeout calculation 



Factor out the target_timeout calculation so it can be re-used.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent a999fd93

drivers/mmc/host/sdhci.c

+30 −18
Original line number Original line Diff line number Diff line
@@ -709,6 +709,35 @@ static u32 sdhci_sdma_address(struct sdhci_host *host) 
		return sg_dma_address(host->data->sg);

		return sg_dma_address(host->data->sg);

}

}





static unsigned int sdhci_target_timeout(struct sdhci_host *host,

					 struct mmc_command *cmd,

					 struct mmc_data *data)

{

	unsigned int target_timeout;



	/* timeout in us */

	if (!data) {

		target_timeout = cmd->busy_timeout * 1000;

	} else {

		target_timeout = DIV_ROUND_UP(data->timeout_ns, 1000);

		if (host->clock && data->timeout_clks) {

			unsigned long long val;



			/*

			 * data->timeout_clks is in units of clock cycles.

			 * host->clock is in Hz.  target_timeout is in us.

			 * Hence, us = 1000000 * cycles / Hz.  Round up.

			 */

			val = 1000000ULL * data->timeout_clks;

			if (do_div(val, host->clock))

				target_timeout++;

			target_timeout += val;

		}

	}



	return target_timeout;

}



static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,

static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,

			     bool *too_big)

			     bool *too_big)

{

{
@@ -732,24 +761,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd, 
		return 0xE;

		return 0xE;





	/* timeout in us */

	/* timeout in us */

	if (!data)

	target_timeout = sdhci_target_timeout(host, cmd, data);

		target_timeout = cmd->busy_timeout * 1000;

	else {

		target_timeout = DIV_ROUND_UP(data->timeout_ns, 1000);

		if (host->clock && data->timeout_clks) {

			unsigned long long val;



			/*

			 * data->timeout_clks is in units of clock cycles.

			 * host->clock is in Hz.  target_timeout is in us.

			 * Hence, us = 1000000 * cycles / Hz.  Round up.

			 */

			val = 1000000ULL * data->timeout_clks;

			if (do_div(val, host->clock))

				target_timeout++;

			target_timeout += val;

		}

	}





	/*

	/*

	 * Figure out needed cycles.

	 * Figure out needed cycles.