From patchwork Wed Jul 10 15:42:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2825778 Return-Path: X-Original-To: patchwork-linux-arm@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 15BEBC0AB2 for ; Wed, 10 Jul 2013 15:43:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4CE2F20196 for ; Wed, 10 Jul 2013 15:43:37 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FC6D20187 for ; Wed, 10 Jul 2013 15:43:35 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwwXh-0007FG-UX; Wed, 10 Jul 2013 15:42:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwwXX-0000RH-So; Wed, 10 Jul 2013 15:42:47 +0000 Received: from mail-gh0-f201.google.com ([209.85.160.201]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwwXM-0000OH-4C for linux-arm-kernel@lists.infradead.org; Wed, 10 Jul 2013 15:42:37 +0000 Received: by mail-gh0-f201.google.com with SMTP id r14so622296ghr.2 for ; Wed, 10 Jul 2013 08:42:14 -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=qO0awSaELOjjEu7HPhXJ9GNcaZa+zuTCZa3QpNQzNHA=; b=BJrfyk3pq+JLEQzaJieL7tRhuJWWKTdG/s21F0FfNBadJihere57PA7sA+PmmxY3kp eDyz2cHRWzXDXTY13HyevxlwltzB20uS5v0oTi5eYxGGJhP1R1s7svc/dpI30bUHDVZq JNBJtMSsgbPy2GVRToISJOrRdxjE4J4+nsWvh0sG5RGGGpGQgE790VFO2CCeh5LOWyWS LVI0kU86cEFQxjOroZ90o2x66t1BNXpiEtnJZSpd3+Wv3hQnoQkccev3BEKIpxC1Dsf2 gBOCUIRpKcKZEHEzIdscxDo6nhdHa21eE3jq+NLHo9f6a0l4az+OKiH959x2NDjRCbpX UMQQ== X-Received: by 10.236.93.113 with SMTP id k77mr17055353yhf.25.1373470934786; Wed, 10 Jul 2013 08:42:14 -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 n70si1954518yhj.7.2013.07.10.08.42.14 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Wed, 10 Jul 2013 08:42:14 -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 95F0A31C0F6; Wed, 10 Jul 2013 08:42:14 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 4CCD880B55; Wed, 10 Jul 2013 08:42:14 -0700 (PDT) From: Doug Anderson To: Chris Ball Subject: [PATCH v3 3/5] mmc: dw_mmc: Add exynos resume_noirq callback to clear WAKEUP_INT Date: Wed, 10 Jul 2013 08:42:04 -0700 Message-Id: <1373470926-19314-4-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1373470926-19314-1-git-send-email-dianders@chromium.org> References: <1373411961-23812-1-git-send-email-dianders@chromium.org> <1373470926-19314-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQmlJviGeBTgrsARx7CCcVYMyHpu25CeYtuvFH+4Ipc/XjEu63NM3vioY4vsiF3NF8jfxXhnpNdCZ7wNsY8pNCz4dj6pqJWTR3DWpCr9nEtOfXQdo7EoeLYC9D/z/kLO40wSEXZGh9uFAbGA1gcV23ZBkHNEr0a+bdI8y5a005Kh8P3e5D/2etG4P+najhIYEolbLA9lEfmaHt6MNKA6jSQTPpPkqw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130710_114236_232126_3ADD006E X-CRM114-Status: GOOD ( 12.89 ) X-Spam-Score: -2.9 (--) Cc: Doug Anderson , linux-samsung-soc@vger.kernel.org, James Hogan , Grant Grundler , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Tomasz Figa , Abhilash Kesavan , Jaehoon Chung , Seungwon Jeon , Kukjin Kim , Alim Akhtar , Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 If the WAKEUP_INT is asserted at wakeup and not cleared, we'll end up looping around forever. This has been seen to happen on exynos5420 silicon despite the fact that we haven't enabled any wakeup events. Signed-off-by: Doug Anderson --- Changes in v3: None Changes in v2: - Use suspend_noirq as per James Hogan. drivers/mmc/host/dw_mmc-exynos.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c index f013e7e..36b9620 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c @@ -30,6 +30,7 @@ #define SDMMC_CLKSEL_TIMING(x, y, z) (SDMMC_CLKSEL_CCLK_SAMPLE(x) | \ SDMMC_CLKSEL_CCLK_DRIVE(y) | \ SDMMC_CLKSEL_CCLK_DIVIDER(z)) +#define SDMMC_CLKSEL_WAKEUP_INT BIT(11) #define SDMMC_CMD_USE_HOLD_REG BIT(29) @@ -102,6 +103,27 @@ static int dw_mci_exynos_setup_clock(struct dw_mci *host) return 0; } +/** + * dw_mci_exynos_resume_noirq - Exynos-specific resume code + * + * We have seen cases (at least on the exynos5420) where turning off the INT + * power rail during suspend will leave the WAKEUP_INT bit in the CLKSEL + * register asserted. This bit is 1 to indicate that it fired and we can + * clear it by writing a 1 back. Clear it to prevent interrupts from going off + * constantly. + */ + +static int dw_mci_exynos_resume_noirq(struct dw_mci *host) +{ + u32 clksel; + + clksel = mci_readl(host, CLKSEL); + if (clksel & SDMMC_CLKSEL_WAKEUP_INT) + mci_writel(host, CLKSEL, clksel); + + return 0; +} + static void dw_mci_exynos_prepare_command(struct dw_mci *host, u32 *cmdr) { /* @@ -165,6 +187,7 @@ static const struct dw_mci_drv_data exynos_drv_data = { .caps = exynos_dwmmc_caps, .init = dw_mci_exynos_priv_init, .setup_clock = dw_mci_exynos_setup_clock, + .resume_noirq = dw_mci_exynos_resume_noirq, .prepare_command = dw_mci_exynos_prepare_command, .set_ios = dw_mci_exynos_set_ios, .parse_dt = dw_mci_exynos_parse_dt,