From patchwork Tue Aug 6 21:37:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2839634 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 E4A589F479 for ; Tue, 6 Aug 2013 21:38:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 135FE201BA for ; Tue, 6 Aug 2013 21:38:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B08C3201DA for ; Tue, 6 Aug 2013 21:38:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756651Ab3HFViI (ORCPT ); Tue, 6 Aug 2013 17:38:08 -0400 Received: from mail-qa0-f73.google.com ([209.85.216.73]:40442 "EHLO mail-qa0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755835Ab3HFViE (ORCPT ); Tue, 6 Aug 2013 17:38:04 -0400 Received: by mail-qa0-f73.google.com with SMTP id f14so134409qak.4 for ; Tue, 06 Aug 2013 14:38:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fRvqf3opZ71gZUSMuoU7qj9Rqkz8bdPozI3Yl6HazUg=; b=LpIxBi9WnMlO5d+n3eTFm9nRs7QaAMOP3STrAErcoRxY4zMhIK8K8/nxrywany77Ck 9s8HcpDCrOe0TNnocP9ttghkTStp5Lg4fQkSt9e3m7vSlblqe36aJvf+CNsVxLS8ckft jvkQycu6eUYO2TsQUFITABRa+ib6mHMudwiJPSdAjvR5zV5c5ADk7T/VetMYFp0guGu9 IlRDKWonmzupFX2Ng2P9kbOFcOgdJyKERW/zPCT1jDIDMOZ7e3C6uSb/tq8N+nZmMSP0 6epIz8cCF7L0XsH0sGOJySuvR8ws0dRGOOmdj7VX8ozjE7CnElcM3FvoF1vepApViw3b OV8A== X-Gm-Message-State: ALoCoQnkSFikcaO4ucpcVU/Y4ymb0h3MwF0Rt9unK9AqCyg3fQtqMOu7eWe+YnSIfUJGrbvCTxWgja12eaN2xu2VsvhLMJWBeaE3X5EuMvRGh4POZKW6K1UqkGl8PWBQNNBmToS+jtxytAff+PTbz1Fi1GOcQhwUixjUG0KpGhOugjrRnxud1K0/c7k+ZaO/DQtdgF+ITBG5wvbtd5ORS0/R4k6Wo/JH/g== X-Received: by 10.236.74.169 with SMTP id x29mr58567yhd.34.1375825081593; Tue, 06 Aug 2013 14:38:01 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id c45si284115yhm.2.2013.08.06.14.38.01 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 06 Aug 2013 14:38:01 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.34]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 67EF95A40F7; Tue, 6 Aug 2013 14:38:01 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 15EF5812A5; Tue, 6 Aug 2013 14:38:01 -0700 (PDT) From: Doug Anderson To: Chris Ball Cc: Olof Johansson , Jaehoon Chung , Seungwon Jeon , James Hogan , Grant Grundler , Alim Akhtar , Abhilash Kesavan , Tomasz Figa , Doug Anderson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/4] mmc: dw_mmc: Set timeout to max upon resume Date: Tue, 6 Aug 2013 14:37:51 -0700 Message-Id: <1375825071-20922-5-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1375825071-20922-1-git-send-email-dianders@chromium.org> References: <1373470926-19314-1-git-send-email-dianders@chromium.org> <1375825071-20922-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=-5.2 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, 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 clean. Signed-off-by: Doug Anderson Acked-by: Seungwon Jeon Reviewed-by: Tomasz Figa --- 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 0fa3135..1abcb36 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2505,6 +2505,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 |