drivers/sdhci_mmc: remove unecessary 2 ms delay

Commit aae1bdf introduced some
additional control at the beginning of the sdhci_send_cmd() function
but the implementation is causing a 2 ms hit on most of the
sdhci_send_cmd() calls.

This patch keeps the same timeout values (keep the safety) but fixes
the delay issue.

Change-Id: I94f1a15e021ed9736ef48f2aab56739dfea7e219
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-67687
Signed-off-by: Jeremy Compostella <[email protected]>
Reviewed-on: https://android.intel.com:443/641719

Author: jeremy-compostella

drivers/sdhci_mmc/sdhci.c

@@ -367,30 +367,32 @@ static uint16_t sdhci_make_cmd(struct cmd *c)
 
 }
 
+static void
+sdhci_wait_for_state_unset(struct sdhci *host, uint16_t bits, uint32_t timeout_us)
+{
+	uint16_t value;
+
+	do {
+		value = sdhci_read16(host, SDHCI_PRESENT_STATE);
+		if (!(value & bits))
+			break;
+		udelay(1);
+	} while (timeout_us-- > 0);
+
+	if (!timeout_us)
+		ewerr("%s() timeout for 0x%x", __func__, bits);
+}
+
 static void
 sdhci_send_cmd(struct mmc *m, struct cmd *c)
 {
 	struct sdhci *host = m->host;
 	uint16_t tmode = 0;
-	uint16_t Timeout;
-	uint32_t Data32;
 
-	Timeout = 10000;
-	do
-	{
-		Data32 = sdhci_read16 (host, SDHCI_PRESENT_STATE);
-		udelay(10);
-	} while ((Timeout-- > 0) && (Data32 & SDHCI_CMD_INHIBIT));
+	sdhci_wait_for_state_unset(host, SDHCI_CMD_INHIBIT, 100000);
 
-	if(c->index != CMD_MMC_SEND_TUNING_BLOCK_HS200)
-	{
-		Timeout = 90;
-		do
-		{
-			Data32 = sdhci_read16 (host, SDHCI_PRESENT_STATE);
-			mdelay(2);
-		} while ((Timeout-- > 0) && (Data32 & SDHCI_DATA_INHIBIT));
-	}
+	if (c->index != CMD_MMC_SEND_TUNING_BLOCK_HS200)
+		sdhci_wait_for_state_unset(host, SDHCI_DATA_INHIBIT, 180000);
 
 	/* clear irq_status/err_sts register */
 	sdhci_write32(host, SDHCI_INT_STATUS, 0xffffffff);