From patchwork Tue Mar 31 11:09:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akash Asthana X-Patchwork-Id: 214775 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E9EBC43331 for ; Tue, 31 Mar 2020 11:11:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A250208E0 for ; Tue, 31 Mar 2020 11:11:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="RRpFUsrS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730380AbgCaLLW (ORCPT ); Tue, 31 Mar 2020 07:11:22 -0400 Received: from mail27.static.mailgun.info ([104.130.122.27]:12692 "EHLO mail27.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730515AbgCaLLW (ORCPT ); Tue, 31 Mar 2020 07:11:22 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1585653081; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=dC0QnFVm0tfK5f7rYZZAiw1ArIlyBk9KTuu+tAImyZo=; b=RRpFUsrS+HTdmuiJoib4GgrF7rNIW+W3P2Ejc8v1XcJEN1fvBvnAMo+/ksq2/tEZ8gP0L3RQ QPwxW7xNQDfUqr7gGP+hXrM/oJIn0ia/KBqfHN9Jl4s1FqwaMFxnTJHmK5/C/wU8N60kpb9t ZPrjnthATPzgDEka44cAJhXpOi8= X-Mailgun-Sending-Ip: 104.130.122.27 X-Mailgun-Sid: WyIzNzdmZSIsICJsaW51eC1zcGlAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e832548.7f07e20a8ce0-smtp-out-n01; Tue, 31 Mar 2020 11:11:04 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 66B43C4478C; Tue, 31 Mar 2020 11:11:04 +0000 (UTC) Received: from akashast-linux.qualcomm.com (blr-c-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: akashast) by smtp.codeaurora.org (Postfix) with ESMTPSA id BA6DEC433F2; Tue, 31 Mar 2020 11:10:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org BA6DEC433F2 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=akashast@codeaurora.org From: Akash Asthana To: gregkh@linuxfoundation.org, agross@kernel.org, bjorn.andersson@linaro.org, wsa@the-dreams.de, broonie@kernel.org, mark.rutland@arm.com, robh+dt@kernel.org, georgi.djakov@linaro.org Cc: linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, swboyd@chromium.org, mgautam@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, mka@chromium.org, dianders@chromium.org, evgreen@chromium.org, Akash Asthana Subject: [PATCH V3 2/8] soc: qcom: geni: Support for ICC voting Date: Tue, 31 Mar 2020 16:39:30 +0530 Message-Id: <1585652976-17481-3-git-send-email-akashast@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585652976-17481-1-git-send-email-akashast@codeaurora.org> References: <1585652976-17481-1-git-send-email-akashast@codeaurora.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Add necessary macros and structure variables to support ICC BW voting from individual SE drivers. Signed-off-by: Akash Asthana --- Changes in V2: - As per Bjorn's comment dropped enums for ICC paths, given the three paths individual members Changes in V3: - Add geni_icc_get, geni_icc_vote_on and geni_icc_vote_off as helper API. - Add geni_icc_path structure in common header drivers/soc/qcom/qcom-geni-se.c | 98 +++++++++++++++++++++++++++++++++++++++++ include/linux/qcom-geni-se.h | 36 +++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c index 7d622ea..9344c14 100644 --- a/drivers/soc/qcom/qcom-geni-se.c +++ b/drivers/soc/qcom/qcom-geni-se.c @@ -720,6 +720,104 @@ void geni_se_rx_dma_unprep(struct geni_se *se, dma_addr_t iova, size_t len) } EXPORT_SYMBOL(geni_se_rx_dma_unprep); +int geni_icc_get(struct geni_se *se, const char *icc_core, const char *icc_cpu, + const char *icc_ddr) +{ + if (icc_core) { + se->to_core.path = devm_of_icc_get(se->dev, "qup-core"); + if (IS_ERR(se->to_core.path)) + return PTR_ERR(se->to_core.path); + } + + if (icc_cpu) { + se->from_cpu.path = devm_of_icc_get(se->dev, "qup-config"); + if (IS_ERR(se->from_cpu.path)) + return PTR_ERR(se->from_cpu.path); + } + + if (icc_ddr) { + se->to_ddr.path = devm_of_icc_get(se->dev, "qup-memory"); + if (IS_ERR(se->to_ddr.path)) + return PTR_ERR(se->to_ddr.path); + } + + return 0; +} +EXPORT_SYMBOL(geni_icc_get); + +int geni_icc_vote_on(struct geni_se *se) +{ + int ret; + + if (se->to_core.path) { + ret = icc_set_bw(se->to_core.path, se->to_core.avg_bw, + se->to_core.peak_bw); + if (ret) { + dev_err_ratelimited(se->dev, "%s: ICC BW voting failed for core\n", + __func__); + return ret; + } + } + + if (se->from_cpu.path) { + ret = icc_set_bw(se->from_cpu.path, se->from_cpu.avg_bw, + se->from_cpu.peak_bw); + if (ret) { + dev_err_ratelimited(se->dev, "%s: ICC BW voting failed for cpu\n", + __func__); + return ret; + } + } + + if (se->to_ddr.path) { + ret = icc_set_bw(se->to_ddr.path, se->to_ddr.avg_bw, + se->to_ddr.peak_bw); + if (ret) { + dev_err_ratelimited(se->dev, "%s: ICC BW voting failed for ddr\n", + __func__); + return ret; + } + } + + return 0; +} +EXPORT_SYMBOL(geni_icc_vote_on); + +int geni_icc_vote_off(struct geni_se *se) +{ + int ret; + + if (se->to_core.path) { + ret = icc_set_bw(se->to_core.path, 0, 0); + if (ret) { + dev_err_ratelimited(se->dev, "%s: ICC BW remove failed for core\n", + __func__); + return ret; + } + } + + if (se->from_cpu.path) { + ret = icc_set_bw(se->from_cpu.path, 0, 0); + if (ret) { + dev_err_ratelimited(se->dev, "%s: ICC BW remove failed for cpu\n", + __func__); + return ret; + } + } + + if (se->to_ddr.path) { + ret = icc_set_bw(se->to_ddr.path, 0, 0); + if (ret) { + dev_err_ratelimited(se->dev, "%s: ICC BW remove failed for ddr\n", + __func__); + return ret; + } + } + + return 0; +} +EXPORT_SYMBOL(geni_icc_vote_off); + static int geni_se_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; diff --git a/include/linux/qcom-geni-se.h b/include/linux/qcom-geni-se.h index dd46494..a83c86b 100644 --- a/include/linux/qcom-geni-se.h +++ b/include/linux/qcom-geni-se.h @@ -6,6 +6,8 @@ #ifndef _LINUX_QCOM_GENI_SE #define _LINUX_QCOM_GENI_SE +#include + /* Transfer mode supported by GENI Serial Engines */ enum geni_se_xfer_mode { GENI_SE_INVALID, @@ -25,6 +27,12 @@ enum geni_se_protocol_type { struct geni_wrapper; struct clk; +struct geni_icc_path { + struct icc_path *path; + unsigned int avg_bw; + unsigned int peak_bw; +}; + /** * struct geni_se - GENI Serial Engine * @base: Base Address of the Serial Engine's register block @@ -33,6 +41,9 @@ struct clk; * @clk: Handle to the core serial engine clock * @num_clk_levels: Number of valid clock levels in clk_perf_tbl * @clk_perf_tbl: Table of clock frequency input to serial engine clock + * @to_core: ICC path structure for geni to core + * @from_cpu: ICC path structure for cpu to geni + * @to_ddr: ICC path structure for geni to ddr */ struct geni_se { void __iomem *base; @@ -41,6 +52,9 @@ struct geni_se { struct clk *clk; unsigned int num_clk_levels; unsigned long *clk_perf_tbl; + struct geni_icc_path to_core; + struct geni_icc_path from_cpu; + struct geni_icc_path to_ddr; }; /* Common SE registers */ @@ -229,6 +243,21 @@ struct geni_se { #define GENI_SE_VERSION_MINOR(ver) ((ver & HW_VER_MINOR_MASK) >> HW_VER_MINOR_SHFT) #define GENI_SE_VERSION_STEP(ver) (ver & HW_VER_STEP_MASK) +/* + * Define bandwidth thresholds that cause the underlying Core 2X interconnect + * clock to run at the named frequency. These baseline values are recommended + * by the hardware team, and are not dynamically scaled with GENI bandwidth + * beyond basic on/off. + */ +#define CORE_2X_19_2_MHZ 960 +#define CORE_2X_50_MHZ 2500 +#define CORE_2X_100_MHZ 5000 +#define CORE_2X_150_MHZ 7500 +#define CORE_2X_200_MHZ 10000 +#define CORE_2X_236_MHZ 16383 + +#define GENI_DEFAULT_BW Bps_to_icc(1000) + #if IS_ENABLED(CONFIG_QCOM_GENI_SE) u32 geni_se_get_qup_hw_version(struct geni_se *se); @@ -416,5 +445,12 @@ int geni_se_rx_dma_prep(struct geni_se *se, void *buf, size_t len, void geni_se_tx_dma_unprep(struct geni_se *se, dma_addr_t iova, size_t len); void geni_se_rx_dma_unprep(struct geni_se *se, dma_addr_t iova, size_t len); + +int geni_icc_get(struct geni_se *se, const char *icc_core, const char *icc_cpu, + const char *icc_ddr); + +int geni_icc_vote_on(struct geni_se *se); + +int geni_icc_vote_off(struct geni_se *se); #endif #endif