From patchwork Thu Aug 29 16:39:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2851517 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E1EDB9F3CE for ; Thu, 29 Aug 2013 16:45:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF54A20134 for ; Thu, 29 Aug 2013 16:45:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94E6820117 for ; Thu, 29 Aug 2013 16:45:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755281Ab3H2QpX (ORCPT ); Thu, 29 Aug 2013 12:45:23 -0400 Received: from mail-ve0-f202.google.com ([209.85.128.202]:45008 "EHLO mail-ve0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754242Ab3H2QpX (ORCPT ); Thu, 29 Aug 2013 12:45:23 -0400 Received: by mail-ve0-f202.google.com with SMTP id ox1so55928veb.5 for ; Thu, 29 Aug 2013 09:45:22 -0700 (PDT) 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=5rcAIkAN1TLQ1iC1BenUiEtFo0Uu12UTzbWoekAtqJI=; b=Wyl6DAF9dl4yxcrET/4rmc73g4VTVs+bRKnJv5DDC+nKwsjocYdQ1CPVgPZnWam5rb 0vOgjJcGEkST+0R2+Juj8hPebVr3HXGMOK/AqMMxT4qU8TjpbwA6Jrc91XgntoPUw2bq 0TAkjkpyvSCvkJqXMzi7DN70Wi9sx3V0kda/6u9pf0K8BQLSNneslVuW7uBFNvHQKNaZ T7dnCATSpVXP24H4RTX897cZmdXf2eh3aMWlouWv1lNU6KDwqhSbSDy5aSmltOpXLNss scS1n0wmow49TGhEtIi3tyamCfCfqpwgyTOY+Tnd6mPqqduchqFFZw/idMAfMpBtTk5x 7VpQ== X-Gm-Message-State: ALoCoQnz6pXKv6nrUdu2K8y4iMBOPFp5PZJrQ++dTO+mmhAin3cn4K9Bzibo+Erud8801ntdX0b2BqQ0QgkQG9Vg9ShdS9b/mpVOv40Os0jvaxvyWAj2bw6SHTy5WfH87HrL2aWCaDcXJAE9jk8EgmLAntJ6+iE4m/2mnIwJZc0I/hNNpGHWAi/Sb9TCZtZtkG+2SDALZ6D1uqC/xehaPV1RJ5l6wdftEA== X-Received: by 10.236.223.130 with SMTP id v2mr1547005yhp.34.1377794357743; Thu, 29 Aug 2013 09:39:17 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id a42si1970409yhj.6.1969.12.31.16.00.00 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Thu, 29 Aug 2013 09:39:17 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.72.141]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 914B431C254; Thu, 29 Aug 2013 09:39:17 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 43CCE80B1F; Thu, 29 Aug 2013 09:39:17 -0700 (PDT) From: Doug Anderson To: Chris Ball Cc: Jaehoon Chung , Seungwon Jeon , James Hogan , Grant Grundler , Alim Akhtar , Abhilash Kesavan , Tomasz Figa , Olof Johansson , Doug Anderson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 3/3] mmc: dw_mmc: Set timeout to max upon resume Date: Thu, 29 Aug 2013 09:39:10 -0700 Message-Id: <1377794350-12335-4-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377794350-12335-1-git-send-email-dianders@chromium.org> References: <1377188348-3418-1-git-send-email-dianders@chromium.org> <1377794350-12335-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=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The TMOUT register is initted to 0xffffffff at probe time but isn't initted after suspend/resume. Add an init of this value. No problems were observed without this (it will also get initted in __dw_mci_start_request if there is data to send), but it makes the register dump before and after suspend cleaner. Signed-off-by: Doug Anderson Acked-by: Seungwon Jeon Reviewed-by: Tomasz Figa --- Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None drivers/mmc/host/dw_mmc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1584705..f8d891a 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2513,6 +2513,9 @@ int dw_mci_resume(struct dw_mci *host) /* Restore the old value at FIFOTH register */ mci_writel(host, FIFOTH, host->fifoth_val); + /* Put in max timeout */ + mci_writel(host, TMOUT, 0xFFFFFFFF); + mci_writel(host, RINTSTS, 0xFFFFFFFF); mci_writel(host, INTMASK, SDMMC_INT_CMD_DONE | SDMMC_INT_DATA_OVER | SDMMC_INT_TXDR | SDMMC_INT_RXDR |