From patchwork Wed Nov 19 19:37:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5340651 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 516F8C11AC for ; Wed, 19 Nov 2014 19:40:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84DD42020E for ; Wed, 19 Nov 2014 19:40:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 33242201FB for ; Wed, 19 Nov 2014 19:40:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrB4Z-0008Gl-MS; Wed, 19 Nov 2014 19:37:51 +0000 Received: from mail-ie0-x22a.google.com ([2607:f8b0:4001:c03::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrB4W-0008EZ-Aa for linux-arm-kernel@lists.infradead.org; Wed, 19 Nov 2014 19:37:48 +0000 Received: by mail-ie0-f170.google.com with SMTP id rd18so1222432iec.1 for ; Wed, 19 Nov 2014 11:37:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=sELk8bIz4Z2va9XqcGNuV5rAVcDsndAXxiSzvuip3Z0=; b=Fhkdvi7GFs/uCkjcQijnYMUQZSh6Vka1AL9uHXG5kZ99LDNKYQ56XJxR9qMzEaTyF1 /8Y9AV5EbEALk4CytmEqksGVuEnZcyD9VNpJNiFyuvnbv5/wvNbGkvVIN7/987wmbhwO y2iCowtl9B1wVko1i17vAd8u5+94XnuSb2ig8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sELk8bIz4Z2va9XqcGNuV5rAVcDsndAXxiSzvuip3Z0=; b=S7mY3RGyapGDDJqnm4QMBCJrnaG/ugc2+gshMOfKaoY1vg2LuzBuN9eORRsklIuanZ oxj1EUpyWspl4hPcCMQuVzkiMg7VwiZk8h9MES0nSKhSZzpeFwOf4ytob9rE99HGZWy4 HcL2apWAVjynqZNbCnFeBRZGAHuLc32Zt74TBOlGon4qKHQR7W11+TqtdRJdXAhs1KfN cn0Y/muSxbnUznhNMSKD0jyW/aIbcACbSmHokCrjhekaXWD6Y2ifX1sR1ih0r1+QxdJu mb2qP1966eNxiShbp7xsJzpSM58JSVqrAV3bTpc3SjOZoTOd9aUwjEVypX4+lzDgGVw+ 8BtA== X-Gm-Message-State: ALoCoQkNovhYJnRccRMtjTWXRyAzGJlnAvz0noGjHOiS6v39tjV3E56Tka2e/1+rcx183RW06ix6 X-Received: by 10.50.25.100 with SMTP id b4mr5150189igg.17.1416425846854; Wed, 19 Nov 2014 11:37:26 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id j2sm361284igj.14.2014.11.19.11.37.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Nov 2014 11:37:26 -0800 (PST) From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Ulf Hansson Subject: [PATCH v2] mmc: dw_mmc: Turn the card clock off at suspend time Date: Wed, 19 Nov 2014 11:37:21 -0800 Message-Id: <1416425841-12681-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141119_113748_498549_4EA527D7 X-CRM114-Status: GOOD ( 15.56 ) X-Spam-Score: -0.8 (/) Cc: Heiko Stuebner , Andrew Bresticker , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Doug Anderson , chris@printf.net, linux-rockchip@lists.infradead.org, Alim Akhtar , Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_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 Since the dw_mmc driver was first added to Linux it's had a TODO in it that we should turn off the card clock during suspend. I have no idea for sure why it wasn't done originally, but if I had to guess I'd guess it was related to the lack of a common clock framework. Let's do it now. There is no reason for the card clock to be left on during suspend and most systems will eventually turn it off anyway (when whole clock trees are disabled). However, it's good to be explicit that it's disabled at the time that the MMC subsystem is disabled. This actually fixes a bug on Rockchip rk3288 where an SDIO card wakes the system back up during suspend. Signed-off-by: Doug Anderson --- Changes in v2: - Handle fact that ciu_clk is optional (abrestic) - Check for errors enabling ciu_clk (abrestic) drivers/mmc/host/dw_mmc.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 5a37c33..49f4013 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2825,11 +2825,11 @@ EXPORT_SYMBOL(dw_mci_remove); #ifdef CONFIG_PM_SLEEP -/* - * TODO: we should probably disable the clock to the card in the suspend path. - */ int dw_mci_suspend(struct dw_mci *host) { + if (!IS_ERR(host->ciu_clk)) + clk_disable(host->ciu_clk); + return 0; } EXPORT_SYMBOL(dw_mci_suspend); @@ -2838,9 +2838,15 @@ int dw_mci_resume(struct dw_mci *host) { int i, ret; + if (!IS_ERR(host->ciu_clk)) { + ret = clk_enable(host->ciu_clk); + if (ret) + return ret; + } + if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) { ret = -ENODEV; - return ret; + goto exit_ciu_enabled; } if (host->use_dma && host->dma_ops->init) @@ -2871,7 +2877,14 @@ int dw_mci_resume(struct dw_mci *host) dw_mci_setup_bus(slot, true); } } + return 0; + +exit_ciu_enabled: + if (!IS_ERR(host->ciu_clk)) + clk_disable(host->ciu_clk); + + return ret; } EXPORT_SYMBOL(dw_mci_resume); #endif /* CONFIG_PM_SLEEP */