mmc: sunxi: fix timeout in sunxi_mmc_oclk_onoff

hramrach · storulf · commit 7bb9c244356d · 2015-08-27T14:50:53.000+02:00
The 250ms timeout is too short.

On my system enabling the oclk takes under 50ms and disabling slightly
over 100ms when idle. Under load disabling the clock can take over
350ms.

This does not make mmc clock gating look like good option to have on
sunxi but the system should not crash with mmc clock gating enabled
nonetheless.

This patch sets the timeout to 750ms.

Signed-off-by: Michal Suchanek &lt;hramrach@gmail.com&gt;
Acked-by: Hans de Goede &lt;hdegoede@redhat.com&gt;
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
@@ -595,7 +595,7 @@ static irqreturn_t sunxi_mmc_handle_manual_stop(int irq, void *dev_id)
 
 static int sunxi_mmc_oclk_onoff(struct sunxi_mmc_host *host, u32 oclk_en)
 {
-	unsigned long expire = jiffies + msecs_to_jiffies(250);
+	unsigned long expire = jiffies + msecs_to_jiffies(750);
 	u32 rval;
 
 	rval = mmc_readl(host, REG_CLKCR);

Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ static irqreturn_t sunxi_mmc_handle_manual_stop(int irq, void *dev_id)`
`595`	`595`
`596`	`596`	`static int sunxi_mmc_oclk_onoff(struct sunxi_mmc_host *host, u32 oclk_en)`
`597`	`597`	`{`
`598`		`- unsigned long expire = jiffies + msecs_to_jiffies(250);`
	`598`	`+ unsigned long expire = jiffies + msecs_to_jiffies(750);`
`599`	`599`	`u32 rval;`
`600`	`600`
`601`	`601`	`rval = mmc_readl(host, REG_CLKCR);`