From patchwork Thu Sep 1 14:17:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pramod Gurav X-Patchwork-Id: 9309169 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0040E60756 for ; Thu, 1 Sep 2016 14:17:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC4032942F for ; Thu, 1 Sep 2016 14:17:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0E6D2943E; Thu, 1 Sep 2016 14:17:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B52D129435 for ; Thu, 1 Sep 2016 14:17:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933909AbcIAORs (ORCPT ); Thu, 1 Sep 2016 10:17:48 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:32875 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933914AbcIAORp (ORCPT ); Thu, 1 Sep 2016 10:17:45 -0400 Received: by mail-pf0-f176.google.com with SMTP id g202so8768299pfb.0 for ; Thu, 01 Sep 2016 07:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=jMX3sBVmaQlLKppQWzJ5R2olymPG+mf3u4Y0zJ/6lm8=; b=jgNNdLqdwAaTVEF/LbuoQlcxVZRg45hQcq2TdPvq/1YPWYrhFtNN4rKTWeLVEiPC6f jHMetyob25yReLj101/bl2ah6DKZJuZZWSeTcgdnJuY63LsfZUfB2+sIZD1qGsvmRK8t oM5R1WaIlfzVueDNn+y3wRSEqzRL7rd00VNR8= 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=jMX3sBVmaQlLKppQWzJ5R2olymPG+mf3u4Y0zJ/6lm8=; b=VXp0iPI1Ii4uk8rS5OVvQxqZlln9jE8bpk2nFiRAQHR/6vq63fzWUu9b+k7nBl2Xgz DtaxhFWnGXlWz4D4dO+K8WpMqrAvsMSISej1bXsyUqyvEz02PviK9lT7fUFqaa+Ms+p4 e9fcnuMxThXTs0VPXD6BAy3r/VbYmUcTVxjVLKvxfnMlCV+yh+xc00vuMBs0yukW4TGy ROhBrLiJgwimHqy1PLgIp/NrKcGCdorhuwB/hh/IG5RN5LNnH8xREvGEJ3vOZ2o3qWs9 hC+YfGTGmTdpPOdPGs0JF3AW4FCDRFOmStuP2iecPElfp3YYTe/DwNRSfsjIWLWUqKXR RDQw== X-Gm-Message-State: AE9vXwNiCj20U++XvoBrfSuQPSQyb+JMR8GsFrf37sdWb+bhpC+i6eb6UnsrlPQOosnpwS9R X-Received: by 10.98.77.70 with SMTP id a67mr26875873pfb.151.1472739450105; Thu, 01 Sep 2016 07:17:30 -0700 (PDT) Received: from blr-ubuntu-56.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id 184sm8209076pfg.20.2016.09.01.07.17.26 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Sep 2016 07:17:29 -0700 (PDT) From: Pramod Gurav To: linux-mmc@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, adrian.hunter@intel.com, ulf.hansson@linaro.org, Pramod Gurav Subject: [PATCH] mmc: sdhci-msm: Add pm_runtime and system PM support Date: Thu, 1 Sep 2016 19:47:22 +0530 Message-Id: <20160901141722.31835-1-pramod.gurav@linaro.org> X-Mailer: git-send-email 2.9.3 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Provides runtime PM callbacks to enable and disable clock resources when idle. Also support system PM callbacks to be called during system suspend and resume. Signed-off-by: Pramod Gurav --- Changes in v1: - Added CONFIG_PM around runtime pm function. - Replaced msm suspend/resume with generic function directly Changes in v2: - Moved pm_rutime enabling before adding host - Handled pm_rutime in remove - Changed runtime handling with reference from sdhci-of-at91.c drivers/mmc/host/sdhci-msm.c | 71 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 8ef44a2a..881c564 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "sdhci-pltfm.h" @@ -658,12 +659,26 @@ static int sdhci_msm_probe(struct platform_device *pdev) goto clk_disable; } + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + pm_runtime_set_autosuspend_delay(&pdev->dev, 50); + pm_runtime_use_autosuspend(&pdev->dev); + ret = sdhci_add_host(host); if (ret) - goto clk_disable; + goto pm_runtime_disable; + + platform_set_drvdata(pdev, host); + + pm_runtime_put_autosuspend(&pdev->dev); return 0; +pm_runtime_disable: + pm_runtime_disable(&pdev->dev); + pm_runtime_set_suspended(&pdev->dev); + pm_runtime_put_noidle(&pdev->dev); clk_disable: clk_disable_unprepare(msm_host->clk); pclk_disable: @@ -685,6 +700,11 @@ static int sdhci_msm_remove(struct platform_device *pdev) 0xffffffff); sdhci_remove_host(host, dead); + + pm_runtime_get_sync(&pdev->dev); + pm_runtime_disable(&pdev->dev); + pm_runtime_put_noidle(&pdev->dev); + clk_disable_unprepare(msm_host->clk); clk_disable_unprepare(msm_host->pclk); if (!IS_ERR(msm_host->bus_clk)) @@ -693,12 +713,61 @@ static int sdhci_msm_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static int sdhci_msm_runtime_suspend(struct device *dev) +{ + struct sdhci_host *host = dev_get_drvdata(dev); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); + int ret; + + ret = sdhci_runtime_suspend_host(host); + if (ret) + return ret; + + clk_disable_unprepare(msm_host->clk); + clk_disable_unprepare(msm_host->pclk); + + return 0; +} + +static int sdhci_msm_runtime_resume(struct device *dev) +{ + struct sdhci_host *host = dev_get_drvdata(dev); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); + int ret; + + ret = clk_prepare_enable(msm_host->clk); + if (ret) { + dev_err(dev, "clk_enable failed: %d\n", ret); + return ret; + } + ret = clk_prepare_enable(msm_host->pclk); + if (ret) { + dev_err(dev, "clk_enable failed: %d\n", ret); + clk_disable_unprepare(msm_host->clk); + return ret; + } + + return sdhci_runtime_resume_host(host); +} +#endif + +static const struct dev_pm_ops sdhci_msm_pm_ops = { + SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) + SET_RUNTIME_PM_OPS(sdhci_msm_runtime_suspend, sdhci_msm_runtime_resume, + NULL) +}; + static struct platform_driver sdhci_msm_driver = { .probe = sdhci_msm_probe, .remove = sdhci_msm_remove, .driver = { .name = "sdhci_msm", .of_match_table = sdhci_msm_dt_match, + .pm = &sdhci_msm_pm_ops, }, };