From patchwork Fri Dec 5 17:41:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 5445021 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F02CFBEEA8 for ; Fri, 5 Dec 2014 17:43:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5FB8201F5 for ; Fri, 5 Dec 2014 17:43:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCBA72020F for ; Fri, 5 Dec 2014 17:43:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751378AbaLERnV (ORCPT ); Fri, 5 Dec 2014 12:43:21 -0500 Received: from mga02.intel.com ([134.134.136.20]:60356 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751806AbaLERnT (ORCPT ); Fri, 5 Dec 2014 12:43:19 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 05 Dec 2014 09:43:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,523,1413270000"; d="scan'208";a="649043488" Received: from ahunter-desktop.fi.intel.com ([10.237.72.97]) by orsmga002.jf.intel.com with ESMTP; 05 Dec 2014 09:43:03 -0800 From: Adrian Hunter To: Ulf Hansson , Chris Ball Cc: linux-mmc , Aaron Lu , Philip Rakity , Girish K S , Al Cooper , Arend van Spriel Subject: [PATCH 06/13] mmc: core: Check re-tuning before retrying Date: Fri, 5 Dec 2014 19:41:04 +0200 Message-Id: <1417801271-15575-7-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417801271-15575-1-git-send-email-adrian.hunter@intel.com> References: <1417801271-15575-1-git-send-email-adrian.hunter@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Possibly a command is failing because re-tuning is needed. Use mmc_retune_retry() to check re-tuning. At that point re-tuning is held, at least by the request, so mmc_retune_retry() does a mmc_retune_release() and mmc_retune_hold(). Signed-off-by: Adrian Hunter --- drivers/mmc/core/core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 263b2d6..2c10fb9 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -422,6 +422,11 @@ static int mmc_wait_for_data_req_done(struct mmc_host *host, host->areq); break; /* return err */ } else { + err = mmc_retune_retry(host); + if (err) { + mmc_host_clk_release(host); + break; + } pr_info("%s: req failed (CMD%u): %d, retrying...\n", mmc_hostname(host), cmd->opcode, cmd->error); @@ -447,6 +452,7 @@ static void mmc_wait_for_req_done(struct mmc_host *host, struct mmc_request *mrq) { struct mmc_command *cmd; + int err; while (1) { wait_for_completion(&mrq->completion); @@ -474,6 +480,12 @@ static void mmc_wait_for_req_done(struct mmc_host *host, mmc_card_removed(host->card)) break; + err = mmc_retune_retry(host); + if (err) { + mmc_host_clk_release(host); + break; + } + pr_debug("%s: req failed (CMD%u): %d, retrying...\n", mmc_hostname(host), cmd->opcode, cmd->error); cmd->retries--;