From patchwork Thu Oct 11 12:03:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 10636567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F068416B1 for ; Thu, 11 Oct 2018 12:03:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE1EC2A5DF for ; Thu, 11 Oct 2018 12:03:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1D252B395; Thu, 11 Oct 2018 12:03:42 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 46D512A5DF for ; Thu, 11 Oct 2018 12:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727666AbeJKTag (ORCPT ); Thu, 11 Oct 2018 15:30:36 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:50277 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbeJKTag (ORCPT ); Thu, 11 Oct 2018 15:30:36 -0400 Received: by mail-wm1-f65.google.com with SMTP id i8-v6so8674248wmg.0 for ; Thu, 11 Oct 2018 05:03:39 -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:mime-version :content-transfer-encoding; bh=/MGODQWupRFp3ivTTqHI0aavG641+71/uDj7XngGFGg=; b=C+5c2I05jSUqxANNB3NqXT8WI2wpxGAsfPQxfTK55p8V+0WSQtmDVy8PFQyAkiMw3l ZiF1tGQCYK4Pu3JjLis3/SJc9kotg2LihaWehrllXnJScN/BEM5khS2sRBNYF7CSba7l PpE+DkRofX0SwHpNNCQWygEZTr6uORNidxi5c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/MGODQWupRFp3ivTTqHI0aavG641+71/uDj7XngGFGg=; b=iK7NyHsJjrIW8SOYaoZbUWVKM2o+WmFxVFpg+R00Utj6jIlOZkSebaYruwA2E1a1hF CxfAl+OuFNKRhS9xjzLQWvUW5Nkq+tSJX/84LkQKtRkLmLt60/oneArlyNZtYqaS/BWR lPRV6OCR6l7fFZG2g7PCMRNYAxrLVM3cbOOlSwdMXr0Q8L4vvlKHAgGu0nFrey8Aqe9v ZgaSW41pF0WhUWFS9kT0cVciXXYNCsdBJDZaI5ycVDgZr/udQf28hBpBzTPCNCaW9/zk XcUWW1t8D+tKNh2RQBFAbG9twBH0NKHiVFOLnTrMrbWUdWT6A1Ku1qbMrIjL0doRKWFs D8YQ== X-Gm-Message-State: ABuFfoj9uxtqbxa64Lm1Van3nmGBXe7yso2KjQYf0OWTXQF1bZ2i3hsm OtV1OdlmTFdf/Fl7LsjUBFaxEw== X-Google-Smtp-Source: ACcGV60hBJuj1AU1kIkP3QWJUoiHVEGJiZsOnMKnzDqjuIQHmryh5JujlrhAOtpDw9ORdzB2XGt/nQ== X-Received: by 2002:a1c:f010:: with SMTP id a16-v6mr1378710wmb.5.1539259418847; Thu, 11 Oct 2018 05:03:38 -0700 (PDT) Received: from localhost.localdomain ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id 193-v6sm21983286wmj.21.2018.10.11.05.03.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Oct 2018 05:03:38 -0700 (PDT) From: Georgi Djakov To: linux-pm@vger.kernel.org Cc: gregkh@linuxfoundation.org, rjw@rjwysocki.net, robh+dt@kernel.org, mturquette@baylibre.com, khilman@baylibre.com, vincent.guittot@linaro.org, skannan@codeaurora.org, bjorn.andersson@linaro.org, amit.kucheria@linaro.org, seansw@qti.qualcomm.com, daidavid1@codeaurora.org, evgreen@chromium.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, abailon@baylibre.com, maxime.ripard@bootlin.com, arnd@arndb.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, ulf.hansson@linaro.org, adrian.hunter@intel.com, linux-mmc@vger.kernel.org, georgi.djakov@linaro.org Subject: [RFC] mmc: host: sdhci-msm: Use the interconnect API Date: Thu, 11 Oct 2018 15:03:36 +0300 Message-Id: <20181011120336.9129-1-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The interconnect API provides an interface for consumer drivers to express their bandwidth needs in the SoC. This data is aggregated and the on-chip interconnect hardware is configured to the appropriate power/performance profile. Use the interconnect API to get() the path between the endpoints used for data transfers by the SD host controller and report the needed bandwidth based on the clock rate, bus width and mode. Signed-off-by: Georgi Djakov --- This depends on the interconnect API: https://lkml.org/lkml/2018/8/31/444 TODO: Use macros for converting and rounding to icc units instead of converting between kilobits and kilobytes in the consumer drivers. drivers/mmc/host/sdhci-msm.c | 46 ++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 3cc8bfee6c18..8ca99ccdb035 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -258,6 +259,7 @@ struct sdhci_msm_host { bool mci_removed; const struct sdhci_msm_variant_ops *var_ops; const struct sdhci_msm_offset *offset; + struct icc_path *path; }; static const struct sdhci_msm_offset *sdhci_priv_msm_offset(struct sdhci_host *host) @@ -1627,6 +1629,30 @@ static const struct sdhci_msm_variant_info sdhci_msm_v5_var = { .offset = &sdhci_msm_v5_offset, }; +static int sdhci_msm_icc_update(struct sdhci_msm_host *msm_host) +{ + struct sdhci_host *host = dev_get_drvdata(&msm_host->pdev->dev); + struct mmc_host *mmc = host->mmc; + struct mmc_ios *ios = &mmc->ios; + unsigned char bus_width = 1 << ios->bus_width; + u32 bw; + + /* calculate the needed bandwidth */ + bw = host->clock; + + if (host->timing == MMC_TIMING_UHS_DDR50 || + host->timing == MMC_TIMING_MMC_DDR52) { + bw *= 2; + } + + if (bus_width == 4) + bw /= 2; + else if (bus_width == 1) + bw /= 8; + + return icc_set(msm_host->path, 0, bw / 1000); +} + static const struct of_device_id sdhci_msm_dt_match[] = { {.compatible = "qcom,sdhci-msm-v4", .data = &sdhci_msm_mci_var}, {.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var}, @@ -1698,16 +1724,27 @@ static int sdhci_msm_probe(struct platform_device *pdev) msm_host->saved_tuning_phase = INVALID_TUNING_PHASE; + msm_host->path = of_icc_get(&pdev->dev, "sdhc-mem"); + if (IS_ERR(msm_host->path)) { + ret = PTR_ERR(msm_host->path); + goto pltfm_free; + } + ret = sdhci_msm_icc_update(msm_host); + if (ret) { + dev_warn(&pdev->dev, "Interconnect setup failed (%d)\n", ret); + goto icc_disable; + } + /* Setup SDCC bus voter clock. */ msm_host->bus_clk = devm_clk_get(&pdev->dev, "bus"); if (!IS_ERR(msm_host->bus_clk)) { /* Vote for max. clk rate for max. performance */ ret = clk_set_rate(msm_host->bus_clk, INT_MAX); if (ret) - goto pltfm_free; + goto icc_disable; ret = clk_prepare_enable(msm_host->bus_clk); if (ret) - goto pltfm_free; + goto icc_disable; } /* Setup main peripheral bus clock */ @@ -1883,6 +1920,8 @@ static int sdhci_msm_probe(struct platform_device *pdev) bus_clk_disable: if (!IS_ERR(msm_host->bus_clk)) clk_disable_unprepare(msm_host->bus_clk); +icc_disable: + icc_put(msm_host->path); pltfm_free: sdhci_pltfm_free(pdev); return ret; @@ -1902,6 +1941,7 @@ static int sdhci_msm_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); pm_runtime_put_noidle(&pdev->dev); + icc_put(msm_host->path); clk_bulk_disable_unprepare(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); if (!IS_ERR(msm_host->bus_clk)) @@ -1917,6 +1957,7 @@ static int sdhci_msm_runtime_suspend(struct device *dev) struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); + icc_set(msm_host->path, 0, 0); clk_bulk_disable_unprepare(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); @@ -1929,6 +1970,7 @@ static int sdhci_msm_runtime_resume(struct device *dev) struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); + sdhci_msm_icc_update(msm_host); return clk_bulk_prepare_enable(ARRAY_SIZE(msm_host->bulk_clks), msm_host->bulk_clks); }