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: 6159531 Return-Path: X-Original-To: patchwork-linux-mmc@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 4643FBF4A6 for ; Fri, 3 Apr 2015 18:14:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67BDA203B0 for ; Fri, 3 Apr 2015 18:14:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8873B202F0 for ; Fri, 3 Apr 2015 18:14:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753225AbbDCSNq (ORCPT ); Fri, 3 Apr 2015 14:13:46 -0400 Received: from mail-ie0-f172.google.com ([209.85.223.172]:36490 "EHLO mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751335AbbDCSNm (ORCPT ); Fri, 3 Apr 2015 14:13:42 -0400 Received: by iebrs15 with SMTP id rs15so10597945ieb.3 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=V9C1VWDvr/bMZsaDEO/ET6iMquchIN2DfOHPi+wc5/hIT83Ig0R6FV0vTeErBCEY6N IgGVOC7FrmKxiKmtDg2NefutlHSLuhQxeNlDTUOuBX/1s+B2SMrlFptJpBKoJRg1pn6h gv/Pj3fiWRDMY9oo2BeMJpizoGhV1j4Tu3tsJWvkpIHQEIsxD4WtbMvDzsVfAqOMM9nm CIQajHMZdRgV/BbTLjoAImYtZmQC++bdlppE8ZfmZSoczLBEQv5n8fHP23hxlM+Zw2Dx 290lgAiGXHTsZ+hozAdgNEqY5DjOO+sMe81ds35A4QhhhsD/RXtvFc+AUD70QGmRyNvN DD5Q== X-Gm-Message-State: ALoCoQmz8Z1JJOLP4EemN22rBe30OhVt7LNezO3AF95EQfwQ2HMeZ8WfTfcI8TiU8R8hrxWbJ2rh 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 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 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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);