From patchwork Wed Aug 23 04:15:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 110710 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp3588699qge; Tue, 22 Aug 2017 21:17:31 -0700 (PDT) X-Received: by 10.84.140.5 with SMTP id 5mr1602199pls.38.1503461850930; Tue, 22 Aug 2017 21:17:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503461850; cv=none; d=google.com; s=arc-20160816; b=Fuxd6ZWTnWZlmO7dv5z51uRCUQp13r5ftyI1rbok4cHnIqR+plNj94D5F6AvKLcJgZ jI4B99X43cdPyRSwtCBZKfZO5+8MK37IOCn/WOL/CcC9yVys3D+ON3Ml1Ve/V9ApyMyB 8QqCT+Xncv0lXijiCwLlDsXCCIvVRDRNYej8zJdnRO/7P/0uBs3YJ7btvCXKiOor71Yx IFEN19dixSeDy+L9+6Tiivj8ZOPKzWJIVwrsdQcUuRVvF73QLoG1/dA4kW15aMIu4nmh L00RlwoDYNv2tXNwF5JWDZypqtRlob4atc6SXN4nNAWI6QhPyCvlr5H+u/ErJGOCn8HK OV3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=OC9iOvjCPc/YkkX7iOHzYL/0LYaFUIgKSfABF93dBHU=; b=GFCt9XrBSmPyiFr04cctrzcsaJm+/YMr7h6/eS3Ae+XVV7KhUjNzqFPzg9swLFq8tl OZVkIDR8UQVCUyQFmJQKYdkEIJfGrCqgSO0K81gFN6+6tsYBARaFb2xxg4KfvZlyw+0w Euz6csCc65S1fuyZCrnVsjdIL2LNjIEnPFVsfSaZInOekN2btp4KegZwPAouRM7Q5+4k 7wniERU9o+KpJXAM0J+BfAVRB8i5AMmw6tkm90hxWHMeR/MAuYbnlwIkn2XLouC7HPxv WI48VQm8v4U6TdnWyAdedZFtwI4aFixp5FDvEgiBPdvJAnO0lgpDOhiMIpM4RFlpZ4Lq 2PZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=SRbX/pwH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v3si490067plk.95.2017.08.22.21.17.30; Tue, 22 Aug 2017 21:17:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=SRbX/pwH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753285AbdHWERC (ORCPT + 26 others); Wed, 23 Aug 2017 00:17:02 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:19347 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753202AbdHWERA (ORCPT ); Wed, 23 Aug 2017 00:17:00 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id v7N4F6Rq020925; Wed, 23 Aug 2017 13:15:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v7N4F6Rq020925 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1503461708; bh=OC9iOvjCPc/YkkX7iOHzYL/0LYaFUIgKSfABF93dBHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SRbX/pwHtdlrlcnIDmdGiEhza/P9E1tnNGwpzV5hZGydLNlKNNa0BfzjSnmddAXgm xP193nnpjsIoj6IYP3FBkVftA0StEtCK6bYm7xDtKoxaoRoS+A3Il1lCqcX0XBXD7+ bMVfsVCP75bv40suFFh/isLOpgTZzQziHuxxNd6r6gU24kjwfDbf6b7hq41If8btXK dX7EAjxY9vaFsrLcNreMhnTJixBRXo/t8BeppElBXxBVQafHYTDnwx+SQTQetFHQAk 8yKiqAGw7q5+RdgV04UvhA4bgVI5lWwAiQUPNAMf31k4P5aYOFp3xlj7m+MJr0Aztb gXIBcleRGsk2A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mmc@vger.kernel.org Cc: Piotr Sroka , Hu Ziji , Adrian Hunter , Christian Daudt , Scott Branden , Zhangfei Gao , Kevin Hao , Olof Johansson , Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v4 1/4] mmc: sdhci-cadence: add suspend / resume support Date: Wed, 23 Aug 2017 13:15:00 +0900 Message-Id: <1503461703-16225-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503461703-16225-1-git-send-email-yamada.masahiro@socionext.com> References: <1503461703-16225-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the probe function initializes the PHY, but PHY settings are lost during the sleep state. Restore the PHY registers when resuming. To facilitate this, split sdhci_cdns_phy_init() into the DT parse part and PHY update part so that the latter can be invoked from the resume hook. Signed-off-by: Masahiro Yamada --- Changes in v4: - disable clk if resume fails. Changes in v3: - Use #ifdef CONFIG_PM_SLEEP instead of __maybe_unused - Add own sdhci_cdns_suspend implementation to not depend on the core change Changes in v2: None drivers/mmc/host/sdhci-cadence.c | 106 +++++++++++++++++++++++++++++++++++---- 1 file changed, 97 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index 19d5698244b5..3dca3b3c6436 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c @@ -67,9 +67,16 @@ */ #define SDHCI_CDNS_MAX_TUNING_LOOP 40 +struct sdhci_cdns_phy_param { + u8 addr; + u8 data; +}; + struct sdhci_cdns_priv { void __iomem *hrs_addr; bool enhanced_strobe; + unsigned int nr_phy_params; + struct sdhci_cdns_phy_param phy_params[0]; }; struct sdhci_cdns_phy_cfg { @@ -115,9 +122,22 @@ static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv, return 0; } -static int sdhci_cdns_phy_init(struct device_node *np, - struct sdhci_cdns_priv *priv) +static unsigned int sdhci_cdns_phy_param_count(struct device_node *np) { + unsigned int count = 0; + int i; + + for (i = 0; i < ARRAY_SIZE(sdhci_cdns_phy_cfgs); i++) + if (of_property_read_bool(np, sdhci_cdns_phy_cfgs[i].property)) + count++; + + return count; +} + +static void sdhci_cdns_phy_param_parse(struct device_node *np, + struct sdhci_cdns_priv *priv) +{ + struct sdhci_cdns_phy_param *p = priv->phy_params; u32 val; int ret, i; @@ -127,9 +147,19 @@ static int sdhci_cdns_phy_init(struct device_node *np, if (ret) continue; - ret = sdhci_cdns_write_phy_reg(priv, - sdhci_cdns_phy_cfgs[i].addr, - val); + p->addr = sdhci_cdns_phy_cfgs[i].addr; + p->data = val; + p++; + } +} + +static int sdhci_cdns_phy_init(struct sdhci_cdns_priv *priv) +{ + int ret, i; + + for (i = 0; i < priv->nr_phy_params; i++) { + ret = sdhci_cdns_write_phy_reg(priv, priv->phy_params[i].addr, + priv->phy_params[i].data); if (ret) return ret; } @@ -302,6 +332,8 @@ static int sdhci_cdns_probe(struct platform_device *pdev) struct sdhci_pltfm_host *pltfm_host; struct sdhci_cdns_priv *priv; struct clk *clk; + size_t priv_size; + unsigned int nr_phy_params; int ret; struct device *dev = &pdev->dev; @@ -313,7 +345,9 @@ static int sdhci_cdns_probe(struct platform_device *pdev) if (ret) return ret; - host = sdhci_pltfm_init(pdev, &sdhci_cdns_pltfm_data, sizeof(*priv)); + nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node); + priv_size = sizeof(*priv) + sizeof(priv->phy_params[0]) * nr_phy_params; + host = sdhci_pltfm_init(pdev, &sdhci_cdns_pltfm_data, priv_size); if (IS_ERR(host)) { ret = PTR_ERR(host); goto disable_clk; @@ -322,7 +356,8 @@ static int sdhci_cdns_probe(struct platform_device *pdev) pltfm_host = sdhci_priv(host); pltfm_host->clk = clk; - priv = sdhci_cdns_priv(host); + priv = sdhci_pltfm_priv(pltfm_host); + priv->nr_phy_params = nr_phy_params; priv->hrs_addr = host->ioaddr; priv->enhanced_strobe = false; host->ioaddr += SDHCI_CDNS_SRS_BASE; @@ -336,7 +371,9 @@ static int sdhci_cdns_probe(struct platform_device *pdev) if (ret) goto free; - ret = sdhci_cdns_phy_init(dev->of_node, priv); + sdhci_cdns_phy_param_parse(dev->of_node, priv); + + ret = sdhci_cdns_phy_init(priv); if (ret) goto free; @@ -353,6 +390,57 @@ static int sdhci_cdns_probe(struct platform_device *pdev) return ret; } +#ifdef CONFIG_PM_SLEEP +static int sdhci_cdns_suspend(struct device *dev) +{ + struct sdhci_host *host = dev_get_drvdata(dev); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + int ret; + + if (host->tuning_mode != SDHCI_TUNING_MODE_3) + mmc_retune_needed(host->mmc); + + ret = sdhci_suspend_host(host); + if (ret) + return ret; + + clk_disable_unprepare(pltfm_host->clk); + + return 0; +} + +static int sdhci_cdns_resume(struct device *dev) +{ + struct sdhci_host *host = dev_get_drvdata(dev); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_cdns_priv *priv = sdhci_pltfm_priv(pltfm_host); + int ret; + + ret = clk_prepare_enable(pltfm_host->clk); + if (ret) + return ret; + + ret = sdhci_cdns_phy_init(priv); + if (ret) + goto disable_clk; + + ret = sdhci_resume_host(host); + if (ret) + goto disable_clk; + + return 0; + +disable_clk: + clk_disable_unprepare(pltfm_host->clk); + + return ret; +} +#endif + +static const struct dev_pm_ops sdhci_cdns_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(sdhci_cdns_suspend, sdhci_cdns_resume) +}; + static const struct of_device_id sdhci_cdns_match[] = { { .compatible = "socionext,uniphier-sd4hc" }, { .compatible = "cdns,sd4hc" }, @@ -363,7 +451,7 @@ MODULE_DEVICE_TABLE(of, sdhci_cdns_match); static struct platform_driver sdhci_cdns_driver = { .driver = { .name = "sdhci-cdns", - .pm = &sdhci_pltfm_pmops, + .pm = &sdhci_cdns_pm_ops, .of_match_table = sdhci_cdns_match, }, .probe = sdhci_cdns_probe,