From patchwork Fri Aug 9 16:33:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2842013 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 5A7C39F295 for ; Fri, 9 Aug 2013 16:33:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B3B920328 for ; Fri, 9 Aug 2013 16:33:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A174203F3 for ; Fri, 9 Aug 2013 16:33:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968118Ab3HIQdq (ORCPT ); Fri, 9 Aug 2013 12:33:46 -0400 Received: from mail-qa0-f73.google.com ([209.85.216.73]:61367 "EHLO mail-qa0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968090Ab3HIQda (ORCPT ); Fri, 9 Aug 2013 12:33:30 -0400 Received: by mail-qa0-f73.google.com with SMTP id f14so198762qak.2 for ; Fri, 09 Aug 2013 09:33:29 -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=IG3IXmb//Fdv3sXWA0Ihydk6Dxk3OO5L+RRW6MUOaco=; b=PzbdPjfNyf0YkgyISPnCTHTnJu8knXdLY91qB66tGlgPowmVXJjwshk7Hkx191jnZc 4VqcKAP8ajcVR0ANIxYih9lLzxoEj9z0TsQCsFMHgWH8J/foEAOq4hlpbiYo8hGc5Ieu r4PUR4S7sUOfPLlEj4VPEpPJDmsoqlBXCUvTt3cRYtCzP5ciNCKKvZ/TaZSFiQorRcG+ Wyp/Rs7v0wHLYe65GOh7i34z5V3Zbx9Q37VvAUzCwGPi++HbCAHJ6YAWCFEHprMcmwuZ w+nA/yr64S49mldzyfziIlqMziXg9fQLVgIp5YT1B/m5N6FXjlM91/ik1t4Qw8jRz0f3 v2GQ== X-Gm-Message-State: ALoCoQmWmar8br2r741/MVe3jLFW37FtTJRi4q0qLnNEDWA+rClzSFpO88lQMGCq7aWA6WL6oqKj8em/Xk1unDuOtCdDXBBdk9Vc/r/bmbjr6VPtudsUF2cxETx+pLGyQoMlB/Q/mfGKJ33rqxgM3j1wUKzvAxaj34GsD1CMHqnMDwO7sR4zAE1SgzV5kZBpfyVWoCJ55kZlYMxj7ri03YvE5UfuN8aHmg== X-Received: by 10.236.149.170 with SMTP id x30mr5592570yhj.20.1376066009774; Fri, 09 Aug 2013 09:33:29 -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 m65si1178867yhn.0.2013.08.09.09.33.29 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Fri, 09 Aug 2013 09:33:29 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.34]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 99E5431C0FC; Fri, 9 Aug 2013 09:33:29 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 4B27D80C61; Fri, 9 Aug 2013 09:33:29 -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 v5 4/4] mmc: dw_mmc: Set timeout to max upon resume Date: Fri, 9 Aug 2013 09:33:20 -0700 Message-Id: <1376066000-5495-5-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1376066000-5495-1-git-send-email-dianders@chromium.org> References: <1375825071-20922-1-git-send-email-dianders@chromium.org> <1376066000-5495-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.1 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 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 3d1ee2d..bc9f22c 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 |