From patchwork Tue Oct 6 01:22:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 7332951 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F39539F302 for ; Tue, 6 Oct 2015 01:19:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3E162068E for ; Tue, 6 Oct 2015 01:19:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFB3E20687 for ; Tue, 6 Oct 2015 01:19:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829AbbJFBQU (ORCPT ); Mon, 5 Oct 2015 21:16:20 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:33339 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751520AbbJFBQD (ORCPT ); Mon, 5 Oct 2015 21:16:03 -0400 Received: by lafb9 with SMTP id b9so46820148laf.0 for ; Mon, 05 Oct 2015 18:16:01 -0700 (PDT) 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:in-reply-to :references; bh=0W7g/UdzXuv/Z8j0Vzx14huqpbZ/z4zyqKF5soB/efg=; b=aIoxWbIjkvwJA5hXx6Me/9GUaRMM64Z+1Ls/SxIqyeTDO3Wx6fkuz26pKg1mXpTHcp CPEsoPc3tXYxZ1vC/bwvVZWYKLJUt8q5qPsTyRCBvKVo1au43mPEmKLnDEH2B25wHjna QhSSsaC8tv4OYvkB7pr+gDxEHF7ZusV18EFSxSiHjXI/g10MqmvzyN0+k3uqOAje4WP9 KcAvm8ZzYiCh6LgwWmWRAC5JoIOJd7QukAXvQOKdndG/0+yLnfPjxsOtfmxrczG4/j5w Ywgi6cY6F/5P7fX1c3xt7qSqKBgK+KQShPUr+5+Hx4kVDoP5Qkb9a30b2p/Q6tMVoj7y P+1Q== X-Gm-Message-State: ALoCoQktyRqO+784OsW9mnLb/Iz2hyrCG04H5Wv/KMPDYE9MIKqqfxVkgLPYJkA9NiMnF3YHMSZ5 X-Received: by 10.112.198.97 with SMTP id jb1mr12898731lbc.8.1444094161015; Mon, 05 Oct 2015 18:16:01 -0700 (PDT) Received: from enkidu.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id x1sm4694780lbb.32.2015.10.05.18.15.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Oct 2015 18:16:00 -0700 (PDT) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Cc: ulf.hansson@linaro.org, sebastian.hesselbarth@gmail.com, andrew@lunn.ch, jason@lakedaemon.net, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, nadavh@marvell.com, alior@marvell.com, tawfik@marvell.com, mw@semihalf.com, jaz@semihalf.com Subject: [PATCH 4/8] mmc: sdhci-pxav3: enable proper resuming on Armada 38x SoC Date: Tue, 6 Oct 2015 03:22:38 +0200 Message-Id: <1444094562-31165-5-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1444094562-31165-1-git-send-email-mw@semihalf.com> References: <1444094562-31165-1-git-send-email-mw@semihalf.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 When resuming from suspend on Armada 38x SoC MBus windows have to be re-configured and for that purpose mv_conf_mbus_windows function needed rework. MBus windows register base address obtaining was moved to armada_38x_quirks function in order to be kept in pxa global structure, because it is used during a resume. This commit fixes resuming from suspend by calling MBus windows configuration routine and therefore enabling proper DMA operation. Signed-off-by: Marcin Wojtas --- drivers/mmc/host/sdhci-pxav3.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index f5edf9d..3f71894 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -63,6 +63,7 @@ struct sdhci_pxa { struct clk *clk_io; u8 power_mode; void __iomem *sdio3_conf_reg; + void __iomem *mbus_win_regs; }; /* @@ -81,30 +82,16 @@ struct sdhci_pxa { #define SDIO3_CONF_CLK_INV BIT(0) #define SDIO3_CONF_SD_FB_CLK BIT(2) -static int mv_conf_mbus_windows(struct platform_device *pdev, +static int mv_conf_mbus_windows(struct device *dev, void __iomem *regs, const struct mbus_dram_target_info *dram) { int i; - void __iomem *regs; - struct resource *res; if (!dram) { - dev_err(&pdev->dev, "no mbus dram info\n"); - return -EINVAL; - } - - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (!res) { - dev_err(&pdev->dev, "cannot get mbus registers\n"); + dev_err(dev, "no mbus dram info\n"); return -EINVAL; } - regs = ioremap(res->start, resource_size(res)); - if (!regs) { - dev_err(&pdev->dev, "cannot map mbus registers\n"); - return -ENOMEM; - } - for (i = 0; i < SDHCI_MAX_WIN_NUM; i++) { writel(0, regs + SDHCI_WINDOW_CTRL(i)); writel(0, regs + SDHCI_WINDOW_BASE(i)); @@ -122,8 +109,6 @@ static int mv_conf_mbus_windows(struct platform_device *pdev, writel(cs->base, regs + SDHCI_WINDOW_BASE(i)); } - iounmap(regs); - return 0; } @@ -135,6 +120,14 @@ static int armada_38x_quirks(struct platform_device *pdev, struct sdhci_pxa *pxa = pltfm_host->priv; struct resource *res; + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mbus"); + pxa->mbus_win_regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(pxa->mbus_win_regs)) { + dev_err(mmc_dev(host->mmc), + "failed to obtain MBus windows register base\n"); + return PTR_ERR(pxa->mbus_win_regs); + } + host->quirks &= ~SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN; host->quirks |= SDHCI_QUIRK_MISSING_CAPS; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, @@ -403,7 +396,8 @@ static int sdhci_pxav3_probe(struct platform_device *pdev) ret = armada_38x_quirks(pdev, host); if (ret < 0) goto err_mbus_win; - ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info()); + ret = mv_conf_mbus_windows(&pdev->dev, pxa->mbus_win_regs, + mv_mbus_dram_info()); if (ret < 0) goto err_mbus_win; } @@ -520,6 +514,13 @@ static int sdhci_pxav3_resume(struct device *dev) { int ret; struct sdhci_host *host = dev_get_drvdata(dev); + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_pxa *pxa = pltfm_host->priv; + struct device_node *np = dev->of_node; + + if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) + ret = mv_conf_mbus_windows(dev, pxa->mbus_win_regs, + mv_mbus_dram_info()); pm_runtime_get_sync(dev); ret = sdhci_resume_host(host);