From patchwork Fri Aug 30 15:11:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seungwon Jeon X-Patchwork-Id: 2852110 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 EC5889F2F4 for ; Fri, 30 Aug 2013 15:11:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D4FD2018D for ; Fri, 30 Aug 2013 15:11:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2098A20182 for ; Fri, 30 Aug 2013 15:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756023Ab3H3PLv (ORCPT ); Fri, 30 Aug 2013 11:11:51 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:47157 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752794Ab3H3PLu (ORCPT ); Fri, 30 Aug 2013 11:11:50 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSC00GC2NJMHW40@mailout1.samsung.com> for linux-mmc@vger.kernel.org; Sat, 31 Aug 2013 00:11:50 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id FA.1E.31253.536B0225; Sat, 31 Aug 2013 00:11:50 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-dd-5220b6352959 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 7B.CB.05832.536B0225; Sat, 31 Aug 2013 00:11:49 +0900 (KST) Received: from DOTGIHJUN01 ([12.23.118.161]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MSC001GRNJPCA30@mmp1.samsung.com>; Sat, 31 Aug 2013 00:11:49 +0900 (KST) From: Seungwon Jeon To: linux-mmc@vger.kernel.org Cc: 'Chris Ball' , 'Jaehoon Chung' References: In-reply-to: Subject: [PATCH 04/22] mmc: dw_mmc: Set timeout to max upon resume Date: Sat, 31 Aug 2013 00:11:49 +0900 Message-id: <000701cea593$4044a860$c0cdf920$%jun@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac03z3aCvVFr8FaITt2vKVQKst76fw3OcIrwS9fJ1BAByUIdcA== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsVy+t8zfV2zbQpBBq3zGC22v97IZnHjVxur xZH//YwOzB6Hrqxl9OjbsorR4/MmuQDmKC6blNSczLLUIn27BK6MNZf/sBdM5KzovvyIuYHx JHsXIyeHhICJxLk/p6BsMYkL99azdTFycQgJLGOUWPvwIStM0fstP9ghEosYJU7f3sAK4fxh lOg6eJ8ZpIpNQEvi75s3YLaIgKzEzz8X2EBsZgFviVfz1zB2MXIANXBLrG4OAglzCvBIrPvT CVYuLOAkMan1BFg5i4CqRNP8h2BxXgFbidn7drBB2IISPybfYwEZwyygLjFlSi7EdHmJzWve MoOEJYDCj/7qQhzgJHG26SAjRImIxL4X7xhBLpYQ2MUusXD+LFaIVQIS3yYfYoHolZXYdIAZ 4l1JiYMrbrBMYJSYhWTxLITFs5AsnoVkwwJGllWMoqkFyQXFSelFJnrFibnFpXnpesn5uZsY IdE3YQfjvQPWhxiTgbZPZJYSTc4HRm9eSbyhsZmRhamJqbGRuaUZacJK4rzqLdaBQgLpiSWp 2ampBalF8UWlOanFhxiZODilGhjd3i00z3rtzZvXvknDaaXIfEeRTS/fHq/1jll4T6fo2o1n ytFR7Zv09BS4l97Vet16csF641m/p2vEX3h+pFNu14dHseuY2Vc82nSX+/ou+3+XXwmtfbvz 2tS4DPdLtxKdPkcbFUc6Xzyg+VJS8fSxj5VM7lnBp1pZ8rxYunRzt1aJSWgJBb1VYinOSDTU Yi4qTgQA7sbB+tQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprHKsWRmVeSWpSXmKPExsVy+t9jAV3TbQpBBq/vWllsf72RzeLGrzZW iyP/+xkdmD0OXVnL6NG3ZRWjx+dNcgHMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaG uoaWFuZKCnmJuam2Si4+AbpumTlAm5QUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUY GaCBhHWMGWsu/2EvmMhZ0X35EXMD40n2LkZODgkBE4n3W35A2WISF+6tZ+ti5OIQEljEKHH6 9gZWCOcPo0TXwfvMIFVsAloSf9+8AbNFBGQlfv65wAZiMwt4S7yav4axi5EDqIFbYnVzEEiY U4BHYt2fTrByYQEniUmtJ8DKWQRUJZrmPwSL8wrYSszet4MNwhaU+DH5HgvIGGYBdYkpU3Ih pstLbF7zlhkkLAEUfvRXF+IAJ4mzTQcZIUpEJPa9eMc4gVFoFpJBsxAGzUIyaBaSjgWMLKsY RVMLkguKk9JzjfSKE3OLS/PS9ZLzczcxgmP7mfQOxlUNFocYBTgYlXh4dy5XCBJiTSwrrsw9 xCjBwawkwvtxMVCINyWxsiq1KD++qDQntfgQYzLQmxOZpUST84FpJ68k3tDYxMzI0sjMwsjE 3Jw0YSVx3oOt1oFCAumJJanZqakFqUUwW5g4OKUaGDN/8q5n0phptc8sQOZr1NJLOgUl6t/V Zl5X031tdbmdU3Z/ZfqUq+sq1t614/uqU/rl1GnuQ05TdDL+PVu02bWH26ItrD5Wj3fh0gcV nCUxk7QTN9cGsayxfed31vHNz+XxPw6fbZDuSXt5OGhCTUtfwe6bPZrn+/fM/LzXZ56TWHaL 4afSXiWW4oxEQy3mouJEAHOGKHUxAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected 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.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Doug Anderson The TMOUT register is set to 0xffffffff at probe time but isn't set after suspend/resume. Add an init of this value. No problems were observed without this (it will also be set 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 --- drivers/mmc/host/dw_mmc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 3ad0fd8..b5bf6eb 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2510,6 +2510,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 |