From: Akash Asthana <akashast@codeaurora.org>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: gregkh@linuxfoundation.org, agross@kernel.org, wsa@the-dreams.de,
broonie@kernel.org, mark.rutland@arm.com, robh+dt@kernel.org,
georgi.djakov@linaro.org, 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
Subject: Re: [PATCH V3 2/8] soc: qcom: geni: Support for ICC voting
Date: Tue, 7 Apr 2020 12:15:25 +0530 [thread overview]
Message-ID: <45191b98-60fa-cd49-3067-d58c128d2c9c@codeaurora.org> (raw)
In-Reply-To: <20200331233209.GF254911@minitux>
Hi Bjorn,
On 4/1/2020 5:02 AM, Bjorn Andersson wrote:
> On Tue 31 Mar 04:09 PDT 2020, Akash Asthana wrote:
>
>> Add necessary macros and structure variables to support ICC BW
>> voting from individual SE drivers.
>>
>> Signed-off-by: Akash Asthana <akashast@codeaurora.org>
>> ---
>> 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) {
> Afaict it's only this that might be passed as NULL, so please drop these
> conditionals (keep the last one).
IIUC you're suggesting to drop if (icc_core/cpu) but keep if (icc_ddr) ?
>
>> + se->to_core.path = devm_of_icc_get(se->dev, "qup-core");
>> + if (IS_ERR(se->to_core.path))
> It would be useful to print an error message here (if PTR_ERR(path) !=
> -EPROBE_DEFER).
okay
>
>> + 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) {
> icc_set_bw(NULL, ...) is valid and will return 0, so these checks
> doesn't add any value.
Yeah, ok
>
>> + 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__);
> Please drop the __func__, the message is specific enough.
ok
Regards,
Akash
>
>> + 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);
> Given that these two functions only switch the bandwidth request between
> some value and 0, I really think we should carry a "bool enabled" on the
> path and replace these two functions with
> icc_bulk_enable()/icc_bulk_disable().
>
> The added benefit of this would be that you call icc_set_bw() instead of
> changing the geni_icc_path->{avg_bw,peak_bw} and don't need to keep
> track of them here.
>
> Regards,
> Bjorn
>> +
>> 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 <linux/interconnect.h>
>> +
>> /* 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
>> --
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
next prev parent reply other threads:[~2020-04-07 6:45 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 11:09 [PATCH V3 0/8] Add interconnect support to QSPI and QUP drivers Akash Asthana
2020-03-31 11:09 ` [PATCH V3 1/8] interconnect: Add devm_of_icc_get() as exported API for users Akash Asthana
2020-03-31 11:09 ` [PATCH V3 2/8] soc: qcom: geni: Support for ICC voting Akash Asthana
2020-03-31 17:52 ` Matthias Kaehlcke
2020-04-02 13:46 ` Akash Asthana
2020-03-31 23:32 ` Bjorn Andersson
2020-04-01 16:26 ` Evan Green
2020-04-07 6:46 ` Akash Asthana
2020-04-07 9:58 ` Georgi Djakov
2020-04-08 11:13 ` Akash Asthana
2020-04-07 6:45 ` Akash Asthana [this message]
2020-04-07 22:07 ` Bjorn Andersson
2020-03-31 11:09 ` [PATCH V3 3/8] soc: qcom-geni-se: Add interconnect support to fix earlycon crash Akash Asthana
2020-03-31 18:24 ` Matthias Kaehlcke
2020-04-01 19:46 ` Matthias Kaehlcke
2020-04-07 6:52 ` Akash Asthana
2020-04-07 11:34 ` Akash Asthana
2020-04-07 17:26 ` Matthias Kaehlcke
2020-04-08 11:38 ` Akash Asthana
2020-04-08 17:09 ` Matthias Kaehlcke
2020-03-31 11:09 ` [PATCH V3 4/8] i2c: i2c-qcom-geni: Add interconnect support Akash Asthana
2020-03-31 18:49 ` Matthias Kaehlcke
2020-04-07 7:04 ` Akash Asthana
2020-03-31 11:09 ` [PATCH V3 5/8] spi: spi-geni-qcom: " Akash Asthana
2020-03-31 19:02 ` Matthias Kaehlcke
2020-04-07 7:11 ` Akash Asthana
2020-03-31 11:09 ` [PATCH V3 6/8] tty: serial: qcom_geni_serial: " Akash Asthana
2020-03-31 19:39 ` Matthias Kaehlcke
2020-04-07 9:19 ` Akash Asthana
2020-04-07 9:40 ` Akash Asthana
2020-03-31 11:09 ` [PATCH V3 7/8] spi: spi-qcom-qspi: " Akash Asthana
2020-03-31 11:23 ` Mark Brown
2020-04-07 9:54 ` Akash Asthana
2020-04-07 10:55 ` Mark Brown
2020-04-08 12:17 ` Akash Asthana
2020-04-09 13:17 ` Georgi Djakov
2020-04-09 13:20 ` Mark Brown
2020-04-15 10:34 ` Georgi Djakov
[not found] ` <eca0e6a7-effe-022c-e90e-c0672991251d@codeaurora.org>
2020-04-15 10:54 ` Georgi Djakov
2020-03-31 19:45 ` Matthias Kaehlcke
2020-03-31 11:09 ` [PATCH V3 8/8] arm64: dts: sc7180: Add interconnect for QUP and QSPI Akash Asthana
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45191b98-60fa-cd49-3067-d58c128d2c9c@codeaurora.org \
--to=akashast@codeaurora.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=evgreen@chromium.org \
--cc=georgi.djakov@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mgautam@codeaurora.org \
--cc=mka@chromium.org \
--cc=robh+dt@kernel.org \
--cc=swboyd@chromium.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).