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

Commit 7cf347bd authored by Zhangfei Gao's avatar Zhangfei Gao Committed by Chris Ball
Browse files

mmc: dw_mmc: fix dw_mci_get_cd 



bf626e55 ("mmc: dw_mmc: use slot-gpio to handle cd pin") caused
CDETECT to be ignored, since negated return value of mmc_gpio_get_cd(mmc)
can not be checked by IS_ERR_VALUE.

Also, add spin_lock_bh(&host->lock) for atomic access to
DW_MMC_CARD_PRESENT, otherwise sd detect may occasionally fail.

Signed-off-by: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
Reported-by: default avatarKevin Hilman <khilman@linaro.org>
Reviewed-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Tested-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Tested-by: default avatarKevin Hilman <khilman@linaro.org>
Acked-by: default avatarSeungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 85136b74

drivers/mmc/host/dw_mmc.c

+9 −3
Original line number Diff line number Diff line
@@ -1033,7 +1033,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc) 
	int present;

	struct dw_mci_slot *slot = mmc_priv(mmc);

	struct dw_mci_board *brd = slot->host->pdata;

	int gpio_cd = !mmc_gpio_get_cd(mmc);

	struct dw_mci *host = slot->host;

	int gpio_cd = mmc_gpio_get_cd(mmc);



	/* Use platform get_cd function, else try onboard card detect */

	if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
@@ -1041,11 +1042,12 @@ static int dw_mci_get_cd(struct mmc_host *mmc) 
	else if (brd->get_cd)

		present = !brd->get_cd(slot->id);

	else if (!IS_ERR_VALUE(gpio_cd))

		present = !!gpio_cd;

		present = gpio_cd;

	else

		present = (mci_readl(slot->host, CDETECT) & (1 << slot->id))

			== 0 ? 1 : 0;



	spin_lock_bh(&host->lock);

	if (present) {

		set_bit(DW_MMC_CARD_PRESENT, &slot->flags);

		dev_dbg(&mmc->class_dev, "card is present\n");
@@ -1053,6 +1055,7 @@ static int dw_mci_get_cd(struct mmc_host *mmc) 
		clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);

		dev_dbg(&mmc->class_dev, "card is not present\n");

	}

	spin_unlock_bh(&host->lock);



	return present;

}
@@ -2081,7 +2084,7 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot) 
	return gpio;

}



/* find the cd gpio for a given slot; or -1 if none specified */

/* find the cd gpio for a given slot */

static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot,

					struct mmc_host *mmc)

{
@@ -2411,6 +2414,9 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) 
	if (of_find_property(np, "caps2-mmc-hs200-1_2v", NULL))

		pdata->caps2 |= MMC_CAP2_HS200_1_2V_SDR;



	if (of_get_property(np, "cd-inverted", NULL))

		pdata->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH;



	return pdata;

}