mmc: sdhci: add get_cd() implementation

1. mmc_rescan will call get_cd to know whether the card is present before mmc_rescan_try_freq to avoid useless trials during card removal or start host is called when card is not present. 2. get_cd needs to be checked to resolve slow card removal issue. Signed-off-by: Kevin Liu <kliu5@marvell.com> Signed-off-by: Chris Ball <cjb@laptop.org>

mmc: sdhci: add get_cd() implementation
1. mmc_rescan will call get_cd to know whether the card is present before mmc_rescan_try_freq to avoid useless trials during card removal or start host is called when card is not present. 2. get_cd needs to be checked to resolve slow card removal issue. Signed-off-by: Kevin Liu <kliu5@marvell.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Kevin Liu · Chris Ball · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent 1450734ec6
Showing 1 changed file with 32 additions and 0 deletions Side-by-side Diff
drivers/mmc/host/sdhci.c
@@ -1581,6 +1581,37 @@
 	sdhci_runtime_pm_put(host);
 }
  
+static int sdhci_do_get_cd(struct sdhci_host *host)
+{
+	int gpio_cd = mmc_gpio_get_cd(host->mmc);
+
+	if (host->flags & SDHCI_DEVICE_DEAD)
+		return 0;
+
+	/* If polling/nonremovable, assume that the card is always present. */
+	if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) ||
+	    (host->mmc->caps & MMC_CAP_NONREMOVABLE))
+		return 1;
+
+	/* Try slot gpio detect */
+	if (!IS_ERR_VALUE(gpio_cd))
+		return !!gpio_cd;
+
+	/* Host native card detect */
+	return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);
+}
+
+static int sdhci_get_cd(struct mmc_host *mmc)
+{
+	struct sdhci_host *host = mmc_priv(mmc);
+	int ret;
+
+	sdhci_runtime_pm_get(host);
+	ret = sdhci_do_get_cd(host);
+	sdhci_runtime_pm_put(host);
+	return ret;
+}
+
 static int sdhci_check_ro(struct sdhci_host *host)
 {
 	unsigned long flags;
@@ -2038,6 +2069,7 @@
 static const struct mmc_host_ops sdhci_ops = {
 	.request	= sdhci_request,
 	.set_ios	= sdhci_set_ios,
+	.get_cd		= sdhci_get_cd,
 	.get_ro		= sdhci_get_ro,
 	.hw_reset	= sdhci_hw_reset,
 	.enable_sdio_irq = sdhci_enable_sdio_irq,
...	...	@@ -1581,6 +1581,37 @@
1581	1581	sdhci_runtime_pm_put(host);
1582	1582	}
1583	1583
	1584	+static int sdhci_do_get_cd(struct sdhci_host *host)
	1585	+{
	1586	+ int gpio_cd = mmc_gpio_get_cd(host->mmc);
	1587	+
	1588	+ if (host->flags & SDHCI_DEVICE_DEAD)
	1589	+ return 0;
	1590	+
	1591	+ /* If polling/nonremovable, assume that the card is always present. */
	1592	+ if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) \|\|
	1593	+ (host->mmc->caps & MMC_CAP_NONREMOVABLE))
	1594	+ return 1;
	1595	+
	1596	+ /* Try slot gpio detect */
	1597	+ if (!IS_ERR_VALUE(gpio_cd))
	1598	+ return !!gpio_cd;
	1599	+
	1600	+ /* Host native card detect */
	1601	+ return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);
	1602	+}
	1603	+
	1604	+static int sdhci_get_cd(struct mmc_host *mmc)
	1605	+{
	1606	+ struct sdhci_host *host = mmc_priv(mmc);
	1607	+ int ret;
	1608	+
	1609	+ sdhci_runtime_pm_get(host);
	1610	+ ret = sdhci_do_get_cd(host);
	1611	+ sdhci_runtime_pm_put(host);
	1612	+ return ret;
	1613	+}
	1614	+
1584	1615	static int sdhci_check_ro(struct sdhci_host *host)
1585	1616	{
1586	1617	unsigned long flags;
...	...	@@ -2038,6 +2069,7 @@
2038	2069	static const struct mmc_host_ops sdhci_ops = {
2039	2070	.request = sdhci_request,
2040	2071	.set_ios = sdhci_set_ios,
	2072	+ .get_cd = sdhci_get_cd,
2041	2073	.get_ro = sdhci_get_ro,
2042	2074	.hw_reset = sdhci_hw_reset,
2043	2075	.enable_sdio_irq = sdhci_enable_sdio_irq,