| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <84a42501461f4aee29815a0609fdef8d@codeaurora.org>
Date: Tue, 02 Jul 2019 10:29:10 +0530
From: amasule@...eaurora.org
To: Stanimir Varbanov <stanimir.varbanov@...aro.org>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-msm@...r.kernel.org, vgarodia@...eaurora.org
Subject: Re: [PATCH v3 2/4] media: venus: Update clock scaling
Hi Stan,
On 2019-07-01 18:41, Stanimir Varbanov wrote:
> On 6/25/19 7:27 PM, Aniket Masule wrote:
>> Current clock scaling calculations are same for vpu4 and
>> previous versions. For vpu4, Clock scaling calculations
>> are updated with cycles/mb. This helps in getting precise
>> clock required.
>>
>> Signed-off-by: Aniket Masule <amasule@...eaurora.org>
>> ---
>> drivers/media/platform/qcom/venus/helpers.c | 111
>> ++++++++++++++++++++++++----
>> drivers/media/platform/qcom/venus/helpers.h | 2 +-
>> drivers/media/platform/qcom/venus/vdec.c | 2 +-
>> drivers/media/platform/qcom/venus/venc.c | 2 +-
>> 4 files changed, 99 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/venus/helpers.c
>> b/drivers/media/platform/qcom/venus/helpers.c
>> index f7f724b..e1a0247 100644
>> --- a/drivers/media/platform/qcom/venus/helpers.c
>> +++ b/drivers/media/platform/qcom/venus/helpers.c
>> @@ -348,8 +348,9 @@ static u32 load_per_type(struct venus_core *core,
>> u32 session_type)
>> return mbs_per_sec;
>> }
>>
>> -static int load_scale_clocks(struct venus_core *core)
>> +static int scale_clocks(struct venus_inst *inst)
>> {
>> + struct venus_core *core = inst->core;
>> const struct freq_tbl *table = core->res->freq_tbl;
>> unsigned int num_rows = core->res->freq_tbl_size;
>> unsigned long freq = table[0].freq;
>> @@ -398,6 +399,86 @@ static int load_scale_clocks(struct venus_core
>> *core)
>> return ret;
>> }
>>
>> +static unsigned long calculate_vpp_freq(struct venus_inst *inst)
>> +{
>> + unsigned long vpp_freq = 0;
>> + u32 mbs_per_sec;
>> +
>> + mbs_per_sec = load_per_instance(inst);
>> + vpp_freq = mbs_per_sec * inst->clk_data.codec_freq_data->vpp_freq;
>> + /* 21 / 20 is overhead factor */
>> + vpp_freq += vpp_freq / 20;
>> +
>> + return vpp_freq;
>> +}
>> +
>> +static int scale_clocks_v4(struct venus_inst *inst)
>> +{
>> + struct venus_core *core = inst->core;
>> + const struct freq_tbl *table = core->res->freq_tbl;
>> + unsigned int num_rows = core->res->freq_tbl_size;
>> +
>
> please remove this blank line.
>
>> + struct clk *clk = core->clks[0];
>> + struct device *dev = core->dev;
>> + unsigned int i;
>> + unsigned long freq = 0, freq_core0 = 0, freq_core1 = 0;
>
> could you count the cores as it is done for VIDC_CORE_ID_ ?
> i.e. start counting from one.
>
Sure, I was aligning it with clock handle name in core, but
aligning it with VIDC_CORE_ID_ would give good readability.
>> + int ret;
>> +
>> + freq = calculate_vpp_freq(inst);
>> +
>> + if (freq > table[0].freq)
>> + goto err;
>
> if the goto is triggered the error message will be wrong. Infact the
> dev_err message is targeted for clk_set_rate failure.
>
I will add separate exit for this.
>> +
>> + for (i = 0; i < num_rows; i++) {
>> + if (freq > table[i].freq)
>> + break;
>> + freq = table[i].freq;
>> + }
>> +
>> + inst->clk_data.freq = freq;
>> +
>> + mutex_lock(&core->lock);
>> + list_for_each_entry(inst, &core->instances, list) {
>> + if (inst->clk_data.core_id == VIDC_CORE_ID_1) {
>> + freq_core0 += inst->clk_data.freq;
>> + } else if (inst->clk_data.core_id == VIDC_CORE_ID_2) {
>> + freq_core1 += inst->clk_data.freq;
>> + } else if (inst->clk_data.core_id == VIDC_CORE_ID_3) {
>> + freq_core0 += inst->clk_data.freq;
>> + freq_core1 += inst->clk_data.freq;
>> + }
>> + }
>> + mutex_unlock(&core->lock);
>> +
>> + freq = max(freq_core0, freq_core1);
>> +
>> + ret = clk_set_rate(clk, freq);
>> + if (ret)
>> + goto err;
>> +
>> + ret = clk_set_rate(core->core0_clk, freq);
>> + if (ret)
>> + goto err;
>> +
>> + ret = clk_set_rate(core->core1_clk, freq);
>> + if (ret)
>> + goto err;
>> +
>> + return 0;
>> +
>> +err:
>> + dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret);
>> + return ret;
>> +}
>> +
>> +static int load_scale_clocks(struct venus_inst *inst)
>> +{
>> + if (IS_V4(inst->core))
>> + return scale_clocks_v4(inst);
>> +
>> + return scale_clocks(inst);
>> +}
>> +
>> static void fill_buffer_desc(const struct venus_buffer *buf,
>> struct hfi_buffer_desc *bd, bool response)
>> {
>> @@ -715,35 +796,36 @@ int venus_helper_set_core_usage(struct
>> venus_inst *inst, u32 usage)
>> }
>> EXPORT_SYMBOL_GPL(venus_helper_set_core_usage);
>>
>> -int venus_helper_init_codec_data(struct venus_inst *inst)
>> +int venus_helper_init_codec_freq_data(struct venus_inst *inst)
>> {
>> - const struct codec_data *codec_data;
>> - unsigned int i, codec_data_size;
>
> those deletions shouldn't exist once you fix the git rebase issue.
>
>> + const struct codec_freq_data *codec_freq_data;
>> + unsigned int i, codec_freq_data_size;
>
> could you rename the variables to shorter?
>
Yes
>> u32 pixfmt;
>> int ret = 0;
>>
>> if (!IS_V4(inst->core))
>> return 0;
>>
>> - codec_data = inst->core->res->codec_data;
>> - codec_data_size = inst->core->res->codec_data_size;
>> + codec_freq_data = inst->core->res->codec_freq_data;
>> + codec_freq_data_size = inst->core->res->codec_freq_data_size;
>> pixfmt = inst->session_type == VIDC_SESSION_TYPE_DEC ?
>> inst->fmt_out->pixfmt : inst->fmt_cap->pixfmt;
>>
>> - for (i = 0; i < codec_data_size; i++) {
>> - if (codec_data[i].pixfmt == pixfmt &&
>> - codec_data[i].session_type == inst->session_type) {
>> - inst->clk_data.codec_data = &codec_data[i];
>> + for (i = 0; i < codec_freq_data_size; i++) {
>> + if (codec_freq_data[i].pixfmt == pixfmt &&
>> + codec_freq_data[i].session_type == inst->session_type) {
>> + inst->clk_data.codec_freq_data =
>> + &codec_freq_data[i];
>> break;
>> }
>> }
>>
>> - if (!inst->clk_data.codec_data)
>> + if (!inst->clk_data.codec_freq_data)
>> ret = -EINVAL;
>>
>> return ret;
>> }
>> -EXPORT_SYMBOL_GPL(venus_helper_init_codec_data);
>> +EXPORT_SYMBOL_GPL(venus_helper_init_codec_freq_data);
>>
Thanks,
Aniket
Powered by blists - more mailing lists