mmc: sdhci-pci-o2micro: Fix card detect by dealing with debouncing

Chevron Li · Ulf Hansson · commit e591fcf6b4e3 · 2022-06-14T13:52:53.000-07:00
The result from ->get_cd() may be incorrect as the card detect debouncing isn't managed correctly. Let's fix it. Signed-off-by: Chevron Li<chevron.li@bayhubtech.com> Fixes: 7d44061 ("mmc: sdhci-pci-o2micro: Fix O2 Host data read/write DLL Lock phase shift issue") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220602132543.596-1-chevron.li@bayhubtech.com [Ulf: Updated the commit message] Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c
@@ -152,6 +152,8 @@ static int sdhci_o2_get_cd(struct mmc_host *mmc)
 
 	if (!(sdhci_readw(host, O2_PLL_DLL_WDT_CONTROL1) & O2_PLL_LOCK_STATUS))
 		sdhci_o2_enable_internal_clock(host);
+	else
+		sdhci_o2_wait_card_detect_stable(host);
 
 	return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);
 }

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ static int sdhci_o2_get_cd(struct mmc_host *mmc)`
`152`	`152`
`153`	`153`	`if (!(sdhci_readw(host, O2_PLL_DLL_WDT_CONTROL1) & O2_PLL_LOCK_STATUS))`
`154`	`154`	`sdhci_o2_enable_internal_clock(host);`
	`155`	`+ else`
	`156`	`+ sdhci_o2_wait_card_detect_stable(host);`
`155`	`157`
`156`	`158`	`return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);`
`157`	`159`	`}`