From patchwork Sun Jun 14 17:23:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 6605141 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 40A58C0020 for ; Sun, 14 Jun 2015 17:23:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6182D20522 for ; Sun, 14 Jun 2015 17:23:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AD86205E5 for ; Sun, 14 Jun 2015 17:23:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752132AbbFNRXz (ORCPT ); Sun, 14 Jun 2015 13:23:55 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:35295 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751625AbbFNRXy (ORCPT ); Sun, 14 Jun 2015 13:23:54 -0400 Received: by pdbnf5 with SMTP id nf5so56231774pdb.2; Sun, 14 Jun 2015 10:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=qgFhq+3d0XXphdCFCBvV2PJ9Z1uDZIcVTc1jRCSEfcA=; b=K6m8deb56/A42wwuQoQEmkvdrcdcUytaleucj50MLVksybw0gSaqatxr4PWEbfvJmh qWTIMvgFmMpfNRfjAuum2a8YBj5hw/mLxqWfKbrytEIqzFbg7mX0x0HArTYgHoxj92g6 8cbV54inIpcnHpI/Y/2vKwZmkCt1gI1sMvGGB5BjFVzlW6tpSGAViFaOoB6GmMACel8g svyT4Q1bRKlVjG+24w4aYklfpGsRCoVIeq30oGYSwbEcEJkcpSlrurmxX2z5UdemvP7e TrcILCqOjjpAPUl3KoIctKnbD/BiTTtU4ofX0lXB3DuUgHXkjUc2uVEbGDmdq5dz7Ipg +c7Q== X-Received: by 10.66.145.74 with SMTP id ss10mr41339503pab.28.1434302633907; Sun, 14 Jun 2015 10:23:53 -0700 (PDT) Received: from localhost.localdomain (KD118152108246.ppp-bb.dion.ne.jp. [118.152.108.246]) by mx.google.com with ESMTPSA id ks14sm9716288pab.12.2015.06.14.10.23.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Jun 2015 10:23:53 -0700 (PDT) From: Yoshihiro Kaneko To: linux-mmc@vger.kernel.org Cc: Ian Molton , Ulf Hansson , Simon Horman , Magnus Damm , Kuninori Morimoto , linux-sh@vger.kernel.org Subject: [PATCH/RFC] mmc: tmio: Fix timeout value for command request Date: Mon, 15 Jun 2015 02:23:26 +0900 Message-Id: <1434302606-31040-1-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Takeshi Kihara Fix the problem which timeout occurs at the time of command request with several cards. The timeout value was insufficient as a verification of several cards, so it was changed 5 seconds from 2 seconds. Signed-off-by: Takeshi Kihara Signed-off-by: Yoshihiro Kaneko --- This patch is based on mmc-next branch of Ulf Hansson's mmc tree. drivers/mmc/host/tmio_mmc_pio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index e3dcf31..0f7c4ae 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -230,7 +230,7 @@ static void tmio_mmc_reset_work(struct work_struct *work) */ if (IS_ERR_OR_NULL(mrq) || time_is_after_jiffies(host->last_req_ts + - msecs_to_jiffies(2000))) { + msecs_to_jiffies(5000))) { spin_unlock_irqrestore(&host->lock, flags); return; } @@ -818,7 +818,7 @@ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) ret = tmio_mmc_start_command(host, mrq->cmd); if (!ret) { schedule_delayed_work(&host->delayed_reset_work, - msecs_to_jiffies(2000)); + msecs_to_jiffies(5000)); return; }