From patchwork Wed Sep 27 20:56:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 9974755 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5E65E60375 for ; Wed, 27 Sep 2017 20:57:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 521662935A for ; Wed, 27 Sep 2017 20:57:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46FE92935D; Wed, 27 Sep 2017 20:57:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDDEF2935A for ; Wed, 27 Sep 2017 20:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751981AbdI0U5D (ORCPT ); Wed, 27 Sep 2017 16:57:03 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:45226 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751920AbdI0U5A (ORCPT ); Wed, 27 Sep 2017 16:57:00 -0400 Received: by mail-pg0-f43.google.com with SMTP id 188so8430052pgb.2 for ; Wed, 27 Sep 2017 13:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KCvR6UtIRhJ9mJNfPsSNWC0zkke8o8XolQ26c7EvQoM=; b=JRekOR81tDCnnw/v/mqJS0+hwtKJgCndDnfWzUJfbvtrf9TMZj9HE6avlIhUIhvkUB jYQERrFINuxqNqoMHW/A/5bTj1cmmXz153x2Dor0BhkF5RTunt2XKma6Vm6gOQdPDOJD Q5wmQcjaUKeDk/OMoRwTquLViAodYAX/3OVKc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KCvR6UtIRhJ9mJNfPsSNWC0zkke8o8XolQ26c7EvQoM=; b=JDM45vOe4e0CgmBitFjb+gyeHSD9ksPygxI5HLq+HXFtUarRU4lippCQgJK05ntsk4 TvVemlA+KMxV068rAXc4M06UoRhmbu80KhlfuCbr7e+47Ow6SlAT1RITVQnceBbXrkig E/k8jImvC1NDpObBMT+Yp2kJKynaWsRT7B4J5DQqWmtja2F27YUoooXWfbzjmwfKSCC2 yUY0W4eQBuNkAS4ak//IHGOPgxjRyrSOdSAf2qfkn0kSrUieEnUSykXJEdouWJjf7spw L4r4sWA8s+vruajT5R9afEDwVqPcYISj77uDe3HZ6v3nqsNUA01SbPJsKLiDvEBoghLL 5XtA== X-Gm-Message-State: AHPjjUiy5jIyZ1lzGfK78IMLSKFIHixuIyOqHEOQpDITA1Ti3d7mBU6S AuCqQvIyGpUpFtwktpaVQhwX1A== X-Google-Smtp-Source: AOwi7QBVTbvFvK93YvOmEyk8kA0BEW19KJHQ0tANaal3CDWT1yAqeD+QDreMWNA715Sl4112pVdmsw== X-Received: by 10.99.120.3 with SMTP id t3mr2295210pgc.388.1506545819589; Wed, 27 Sep 2017 13:56:59 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.112.154]) by smtp.gmail.com with ESMTPSA id n12sm24666373pfb.131.2017.09.27.13.56.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Sep 2017 13:56:58 -0700 (PDT) From: Douglas Anderson To: jh80.chung@samsung.com, ulf.hansson@linaro.org, shawn.lin@rock-chips.com Cc: briannorris@chromium.org, amstan@chromium.org, xzy.xu@rock-chips.com, Douglas Anderson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] mmc: dw_mmc: cancel the CTO timer after a voltage switch Date: Wed, 27 Sep 2017 13:56:29 -0700 Message-Id: <20170927205631.31559-2-dianders@chromium.org> X-Mailer: git-send-email 2.14.2.822.g60be5d43e6-goog In-Reply-To: <20170927205631.31559-1-dianders@chromium.org> References: <20170927205631.31559-1-dianders@chromium.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When running with the commit 03de19212ea3 ("mmc: dw_mmc: introduce timer for broken command transfer over scheme") I found this message in the log: Unexpected command timeout, state 7 It turns out that we weren't properly cancelling the new CTO timer in the case that a voltage switch was done. Let's promote the cancel into the dw_mci_cmd_interrupt() function to fix this. Fixes: 03de19212ea3 ("mmc: dw_mmc: introduce timer for broken command transfer over scheme") Signed-off-by: Douglas Anderson Reviewed-by: Shawn Lin --- drivers/mmc/host/dw_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 860313bd952a..f5b2bb4b4d98 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2570,6 +2570,8 @@ static void dw_mci_write_data_pio(struct dw_mci *host) static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status) { + del_timer(&host->cto_timer); + if (!host->cmd_status) host->cmd_status = status; @@ -2662,7 +2664,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) } if (pending & SDMMC_INT_CMD_DONE) { - del_timer(&host->cto_timer); mci_writel(host, RINTSTS, SDMMC_INT_CMD_DONE); dw_mci_cmd_interrupt(host, pending); }