From patchwork Tue Jul 9 23:19:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2825480 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 4086FC0AB2 for ; Tue, 9 Jul 2013 23:21:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 611DD20137 for ; Tue, 9 Jul 2013 23:21:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7902420136 for ; Tue, 9 Jul 2013 23:21:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753597Ab3GIXUh (ORCPT ); Tue, 9 Jul 2013 19:20:37 -0400 Received: from mail-gg0-f201.google.com ([209.85.161.201]:47319 "EHLO mail-gg0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753587Ab3GIXTa (ORCPT ); Tue, 9 Jul 2013 19:19:30 -0400 Received: by mail-gg0-f201.google.com with SMTP id 21so553775ggh.0 for ; Tue, 09 Jul 2013 16:19:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=yQGxsGaR7DuDXrqNKa9/WLT6RzOrzA5o3nu0i7pcffk=; b=cHGwmIz7ysPnqw2mdtbwb98STI7ER8E8xY2XP+73mGhF3l038kHJE52BFCpRtHAYhM zT9z8NzQ8aK2JNccj2JlYnW/shCZvQAnTLkFdAyYJyDKNSsMSvHO+PXucoyQFIxwy/WU iCwryqxNlZMn26C2Pnry9MEh7vE40as9cECaYzmFL5fCo+fS4/ZUb9kxpRgndWZ8U49x CaJG9+CupfvMFD7aCIqw3L+inrRlA2krIie5zw8gZED2gNy5HXrgnvfk47Eun5mg6K/o xGm5t5CM3Y1+7fAYmSl4TNTk3vckdZb3yPRAk3zWMFPmFjs/KCzFbTZhAdmojYLgQfIC b8Iw== X-Received: by 10.236.135.66 with SMTP id t42mr15230296yhi.36.1373411969249; Tue, 09 Jul 2013 16:19:29 -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 t25si14499814yhg.6.2013.07.09.16.19.29 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 09 Jul 2013 16:19:29 -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 1973B5A41DC; Tue, 9 Jul 2013 16:19:29 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id CA9A680720; Tue, 9 Jul 2013 16:19:28 -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 v2 5/5] mmc: dw_mmc: Set timeout to max upon resume Date: Tue, 9 Jul 2013 16:19:21 -0700 Message-Id: <1373411961-23812-6-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1373411961-23812-1-git-send-email-dianders@chromium.org> References: <1373391071-6312-1-git-send-email-dianders@chromium.org> <1373411961-23812-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQlle6gcjx/9ZI+1xanYZ2X8BqqDQt8wJn697r7FdWLRflmfGio9L4ZTwlochV3vPfK3cq9EivyTg6ehpASiyvoR6J0AiKQwruryCM1t0am9HTOs+zYs++mjQCGnoNsYNLx3cZYwjb/0HiW4lPibhrx1vXcAI5wjqCvs3lqW7ABvg9gnUTc9jbZuBDhv6Br5RCZr+KFDppuS9PiuKQ9f0RtRkHau9w== 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, 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 --- 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 be095b7..d2c5db3 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2482,6 +2482,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 |