From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753213AbbDCSNl (ORCPT ); Fri, 3 Apr 2015 14:13:41 -0400 Received: from mail-ie0-f177.google.com ([209.85.223.177]:33578 "EHLO mail-ie0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751335AbbDCSNi (ORCPT ); Fri, 3 Apr 2015 14:13:38 -0400 From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Ulf Hansson Cc: Alim Akhtar , Sonny Rao , Andrew Bresticker , Heiko Stuebner , Addy Ke , Alexandru Stan , javier.martinez@collabora.co.uk, linux-rockchip@lists.infradead.org, Doug Anderson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] mmc: dw_mmc: Increase cmd11 timeout to 500ms Date: Fri, 3 Apr 2015 11:13:05 -0700 Message-Id: <1428084787-8710-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Designware databook claims that cmd11 should be finished in 2ms, but my testing showed that not to be the case in some situations. I've seen cmd11 timeouts of up to 130ms (!) during reboot tests. Let's bump the timeout way up so that we're absolutely sure. CMD11 is only sent during card insertion, so this extra timeout shouldn't be terrible. Fixes: 5c935165da79 ("mmc: dw_mmc: Add a timeout for sending CMD11") Signed-off-by: Doug Anderson --- drivers/mmc/host/dw_mmc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 3883fe6..339a929 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1023,11 +1023,13 @@ static void __dw_mci_start_request(struct dw_mci *host, if (cmd->opcode == SD_SWITCH_VOLTAGE) { /* - * Databook says to fail after 2ms w/ no response; give an - * extra jiffy just in case we're about to roll over. + * Databook says to fail after 2ms w/ no response, but evidence + * shows that sometimes the cmd11 interrupt takes over 130ms. + * We'll set to 500ms, plus an extra jiffy just in case jiffies + * is just about to roll over. */ mod_timer(&host->cmd11_timer, - jiffies + msecs_to_jiffies(2) + 1); + jiffies + msecs_to_jiffies(500) + 1); } if (mrq->stop) -- 2.2.0.rc0.207.ga3a616c