From patchwork Fri Apr 3 18:13:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 6159511 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C90CCBF4A6 for ; Fri, 3 Apr 2015 18:14:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00747203B0 for ; Fri, 3 Apr 2015 18:14:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35782202F0 for ; Fri, 3 Apr 2015 18:14:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ye66c-0004vT-1F; Fri, 03 Apr 2015 18:14:10 +0000 Received: from mail-ig0-x22c.google.com ([2607:f8b0:4001:c05::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ye66W-0004hu-KI for linux-rockchip@lists.infradead.org; Fri, 03 Apr 2015 18:14:05 +0000 Received: by igcau2 with SMTP id au2so68757538igc.1 for ; Fri, 03 Apr 2015 11:13:42 -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=FTK9+3U+y55bFW3vtGy4XyOH4CmR0sBWU0NPl0S+CM0=; b=ewvfIV0GMe+NYvDSR+xNec3ULXEqs8SHa4DeWU0CbvoQaMZM38Lj0SEepteMx6Ym2N LxyAR1S4sj9YQj+dSH3TbHM5OzzpRibO5eEeKjf+C8Gk35/2L8SuP3PkEVmmw62HeVkk HoRvFjvsElyBoL6L6Q0mr0V6rS7uRwf/MkYCc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FTK9+3U+y55bFW3vtGy4XyOH4CmR0sBWU0NPl0S+CM0=; b=nOKKHf5ycseZYoVGNZtcFgwYWcRYf3FOGPtbSJITiFrM7YYgAsnLT82uMqF0eNWq9/ HyzIuLsWFW0Ve+Ch4S9DP1lQiiqE8lLK+omC1Bso8sTMQG1SpXJ1MZy2c8Hm3OPjK0gg nUM15KxKsNqHC8lmfSQDMEoNglZoaF8DJA9Qc3ds4ta/riV7CGQBX0ZooeETz2mDWhZa WTkM4dgsFnCFFGP3wo/8NBstFfVLDaYvkpJzOwndhKYd6oTxcrmwAVK/aEy7gc5P54LX 31ZiMv37xPkXACVIZhF1wwuDXcyNN+rIr4w9C3R+b5IzrZbvpW2oNYhYlHN/bs8OvZDm d+uw== X-Gm-Message-State: ALoCoQlbBzkDxXaImmWbouQ2WvTOyLP5r5gdhg7qmPiTWbSVu1BgKGawcmN4Uqy4A4+YPjIx0dMT X-Received: by 10.43.24.139 with SMTP id re11mr5483082icb.11.1428084821965; Fri, 03 Apr 2015 11:13:41 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id 37sm2321629ioj.0.2015.04.03.11.13.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Apr 2015 11:13:41 -0700 (PDT) From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Ulf Hansson Subject: [PATCH 2/3] mmc: dw_mmc: Add a return in an unexpected cmd11 timeout Date: Fri, 3 Apr 2015 11:13:06 -0700 Message-Id: <1428084787-8710-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1428084787-8710-1-git-send-email-dianders@chromium.org> References: <1428084787-8710-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150403_111404_758392_4A1837FC X-CRM114-Status: UNSURE ( 8.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: Addy Ke , Heiko Stuebner , Andrew Bresticker , linux-mmc@vger.kernel.org, Doug Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Alim Akhtar , Sonny Rao , javier.martinez@collabora.co.uk, Alexandru Stan X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If we get an unexpected cmd11 timeout we shouldn't actually treat it as a timeout (not that we really expect to get an unexpected cmd11 timeout, but still). Fixes: 5c935165da79 ("mmc: dw_mmc: Add a timeout for sending CMD11") Reported-by: Jaehoon Chung Signed-off-by: Doug Anderson --- drivers/mmc/host/dw_mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 339a929..357ef04 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2589,8 +2589,10 @@ static void dw_mci_cmd11_timer(unsigned long arg) { struct dw_mci *host = (struct dw_mci *)arg; - if (host->state != STATE_SENDING_CMD11) - dev_info(host->dev, "Unexpected CMD11 timeout\n"); + if (host->state != STATE_SENDING_CMD11) { + dev_warn(host->dev, "Unexpected CMD11 timeout\n"); + return; + } host->cmd_status = SDMMC_INT_RTO; set_bit(EVENT_CMD_COMPLETE, &host->pending_events);