From patchwork Thu Aug 22 16:19:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Anderson X-Patchwork-Id: 2848327 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 7F5BEBF546 for ; Thu, 22 Aug 2013 16:19:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4934E2052F for ; Thu, 22 Aug 2013 16:19:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 074A72051D for ; Thu, 22 Aug 2013 16:19:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753367Ab3HVQTW (ORCPT ); Thu, 22 Aug 2013 12:19:22 -0400 Received: from mail-qe0-f73.google.com ([209.85.128.73]:38318 "EHLO mail-qe0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753568Ab3HVQTU (ORCPT ); Thu, 22 Aug 2013 12:19:20 -0400 Received: by mail-qe0-f73.google.com with SMTP id b4so212728qen.4 for ; Thu, 22 Aug 2013 09:19:19 -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=Ip6xFI2lmwrxNtq5ELpvswFZScxIveJvVSHBA4ttzm0=; b=E3eHWlHpT/G8mzAcaQqtAUe2Gzunp++l3ujYpAo3oi3zbURPgpoD8ligHfy8lYof6B 58QZ5Q+F8nGTgY9EMnxf/sanHjYPdlH5SLGwGhxBmXXsQReYPMBNrb0E3eDc5sdxBCC6 QmiewCPrlNDLU1fQ6MS+WENc7laGsCDQPmInCHDCOU99XacETJ1Fd8otoOB4WYGwOoFQ Fqiw312NE7iEmpS/YDpTIzEMkPLvrs+HjQXCLmc/eaMTwC8VTHcaeSYG1OJ9rhO6uXwv CglpqEhRWlVBB2CsFBERgqdg8CHM3uUGmK2VFLQaux3ZNwWrsevmIoXoasWCjGlpBBh1 o/2A== X-Gm-Message-State: ALoCoQlYtRrJ28hhx88TTlFEHxrWrvVMwl81+55AnUmJr6txdFsIBkP6IwFWXNxi7d6e/bHCgTFghDnBePW/bWEq0JP0soCIg/U9PzSuft31Om3CluuORUpF2Cgo12DOoLJ1zoTOzj22P55+ttxz5xgKUoo1ZxN0RxQb69VhTlmpyAq/Tz+NkncwTbaegX9YF5WM4nTz85u244zcM4N4/K8wUWQ9smVSKA== X-Received: by 10.236.68.193 with SMTP id l41mr4780820yhd.19.1377188359719; Thu, 22 Aug 2013 09:19:19 -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 g50si897889yhd.0.1969.12.31.16.00.00 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Thu, 22 Aug 2013 09:19:19 -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 8CAC531C1ED; Thu, 22 Aug 2013 09:19:19 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 3EBBE81F90; Thu, 22 Aug 2013 09:19:19 -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 v6 3/3] mmc: dw_mmc: Set timeout to max upon resume Date: Thu, 22 Aug 2013 09:19:08 -0700 Message-Id: <1377188348-3418-4-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1377188348-3418-1-git-send-email-dianders@chromium.org> References: <1377188348-3418-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.7 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 Acked-by: Jaehoon Chung --- 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 f6c7545..6a9a846 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2506,6 +2506,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 |