Commit 04e079cf authored by Scott Branden's avatar Scott Branden Committed by Ulf Hansson
Browse files

mmc: sdhci: fix card presence logic in sdhci_request function 



The sdhci_request function should consider a non-removable device
always present.
Call the correct logic already available in sdhci_do_get_cd function.

This fixes some logic paths where MMC requests are being made to
non-removable devices that do not have the card detect pin connected
on the hardware as it is non-removable.

Signed-off-by: default avatarScott Branden <sbranden@broadcom.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 03a6d291

drivers/mmc/host/sdhci.c

+3 −17
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable); 
static int sdhci_pre_dma_transfer(struct sdhci_host *host,

					struct mmc_data *data,

					struct sdhci_host_next *next);

static int sdhci_do_get_cd(struct sdhci_host *host);



#ifdef CONFIG_PM

static int sdhci_runtime_pm_get(struct sdhci_host *host);
@@ -1358,7 +1359,8 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) 


	sdhci_runtime_pm_get(host);



	present = mmc_gpio_get_cd(host->mmc);

	/* Firstly check card presence */

	present = sdhci_do_get_cd(host);



	spin_lock_irqsave(&host->lock, flags);
@@ -1381,22 +1383,6 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) 


	host->mrq = mrq;



	/*

	 * Firstly check card presence from cd-gpio.  The return could

	 * be one of the following possibilities:

	 *     negative: cd-gpio is not available

	 *     zero: cd-gpio is used, and card is removed

	 *     one: cd-gpio is used, and card is present

	 */

	if (present < 0) {

		/* If polling, assume that the card is always present. */

		if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)

			present = 1;

		else

			present = sdhci_readl(host, SDHCI_PRESENT_STATE) &

					SDHCI_CARD_PRESENT;

	}



	if (!present || host->flags & SDHCI_DEVICE_DEAD) {

		host->mrq->cmd->error = -ENOMEDIUM;

		tasklet_schedule(&host->finish_tasklet);

CRA Git | Maintained and supported by SUSTech CRA and CCSE