From: Mike Tipton <mdtipton@codeaurora.org>
To: Georgi Djakov <georgi.djakov@linaro.org>
Cc: bjorn.andersson@linaro.org, agross@kernel.org,
linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/4] interconnect: qcom: Fix small BW votes being truncated to zero
Date: Thu, 2 Jul 2020 14:02:21 -0700 [thread overview]
Message-ID: <d093fed9-dede-93dc-2990-80769d0d4439@codeaurora.org> (raw)
In-Reply-To: <09f21847-33bc-64fb-aeb7-df5bafa5593c@linaro.org>
On 7/2/2020 4:11 AM, Georgi Djakov wrote:
> Hi Mike,
>
> On 6/23/20 07:08, Mike Tipton wrote:
>> Small BW votes that translate to less than a single BCM unit are
>> currently truncated to zero. Ensure that non-zero BW requests always
>> result in at least a vote of 1 to BCM.
>>
>> Fixes: 976daac4a1c5 ("interconnect: qcom: Consolidate interconnect RPMh support")
>> Signed-off-by: Mike Tipton <mdtipton@codeaurora.org>
>> ---
>> drivers/interconnect/qcom/bcm-voter.c | 27 +++++++++++++++++++--------
>> 1 file changed, 19 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/interconnect/qcom/bcm-voter.c b/drivers/interconnect/qcom/bcm-voter.c
>> index a68c858ca6b7..9e2612fe7fad 100644
>> --- a/drivers/interconnect/qcom/bcm-voter.c
>> +++ b/drivers/interconnect/qcom/bcm-voter.c
>> @@ -54,8 +54,20 @@ static int cmp_vcd(void *priv, struct list_head *a, struct list_head *b)
>> return 1;
>> }
>>
>> +static u64 bcm_div(u64 num, u64 base)
>> +{
>> + /* Ensure that small votes aren't lost. */
>> + if (num && num < base)
>> + return 1;
>> +
>> + do_div(num, base);
>
> do_div() does a 64-by-32 division, which will truncate these to 32-bit.
I can change base to a u32. It doesn't need anything more than that.
>
>> +
>> + return num;
>> +}
>> +
>> static void bcm_aggregate(struct qcom_icc_bcm *bcm)
>> {
>> + struct qcom_icc_node *node;
>> size_t i, bucket;
>> u64 agg_avg[QCOM_ICC_NUM_BUCKETS] = {0};
>> u64 agg_peak[QCOM_ICC_NUM_BUCKETS] = {0};
>> @@ -63,22 +75,21 @@ static void bcm_aggregate(struct qcom_icc_bcm *bcm)
>>
>> for (bucket = 0; bucket < QCOM_ICC_NUM_BUCKETS; bucket++) {
>> for (i = 0; i < bcm->num_nodes; i++) {
>> - temp = bcm->nodes[i]->sum_avg[bucket] * bcm->aux_data.width;
>> - do_div(temp, bcm->nodes[i]->buswidth * bcm->nodes[i]->channels);
>> + node = bcm->nodes[i];
>> + temp = bcm_div(node->sum_avg[bucket] * bcm->aux_data.width,
>> + node->buswidth * node->channels);
>> agg_avg[bucket] = max(agg_avg[bucket], temp);
>>
>> - temp = bcm->nodes[i]->max_peak[bucket] * bcm->aux_data.width;
>> - do_div(temp, bcm->nodes[i]->buswidth);
>> + temp = bcm_div(node->max_peak[bucket] * bcm->aux_data.width,
>> + node->buswidth);
>> agg_peak[bucket] = max(agg_peak[bucket], temp);
>> }
>>
>> temp = agg_avg[bucket] * bcm->vote_scale;
>> - do_div(temp, bcm->aux_data.unit);
>> - bcm->vote_x[bucket] = temp;
>> + bcm->vote_x[bucket] = bcm_div(temp, bcm->aux_data.unit);
>>
>> temp = agg_peak[bucket] * bcm->vote_scale;
>> - do_div(temp, bcm->aux_data.unit);
>> - bcm->vote_y[bucket] = temp;
>> + bcm->vote_y[bucket] = bcm_div(temp, bcm->aux_data.unit);
>> }
>>
>> if (bcm->keepalive && bcm->vote_x[QCOM_ICC_BUCKET_AMC] == 0 &&
>>
>
> The rest looks good.
>
> Thanks,
> Georgi
>
next prev parent reply other threads:[~2020-07-02 21:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 4:08 [PATCH 0/4] interconnect: qcom: Misc bcm-voter changes and fixes Mike Tipton
2020-06-23 4:08 ` [PATCH 1/4] interconnect: qcom: Support bcm-voter-specific TCS wait behavior Mike Tipton
2020-07-02 9:02 ` Georgi Djakov
2020-07-02 21:01 ` Mike Tipton
2020-06-23 4:08 ` [PATCH 2/4] interconnect: qcom: Only wait for completion in AMC/WAKE by default Mike Tipton
2020-06-23 4:08 ` [PATCH 3/4] interconnect: qcom: Add support for per-BCM scaling factors Mike Tipton
2020-06-23 4:08 ` [PATCH 4/4] interconnect: qcom: Fix small BW votes being truncated to zero Mike Tipton
2020-07-02 11:11 ` Georgi Djakov
2020-07-02 21:02 ` Mike Tipton [this message]
2020-07-06 16:45 ` kernel test robot
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=d093fed9-dede-93dc-2990-80769d0d4439@codeaurora.org \
--to=mdtipton@codeaurora.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=georgi.djakov@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
/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).