2023-12-18 11:34:25

by Dikshita Agarwal

[permalink] [raw]
Subject: [PATCH v2 07/34] media: iris: initialize power resources

Add support for initializing Iris "resources", which are clocks,
interconnects, power domains, reset clocks, and clock frequencies
used for Iris hardware.

Signed-off-by: Dikshita Agarwal <[email protected]>
---
drivers/media/platform/qcom/vcodec/iris/Makefile | 3 +-
.../media/platform/qcom/vcodec/iris/iris_core.h | 16 ++
.../media/platform/qcom/vcodec/iris/iris_probe.c | 8 +
.../media/platform/qcom/vcodec/iris/resources.c | 232 +++++++++++++++++++++
.../media/platform/qcom/vcodec/iris/resources.h | 36 ++++
5 files changed, 294 insertions(+), 1 deletion(-)
create mode 100644 drivers/media/platform/qcom/vcodec/iris/resources.c
create mode 100644 drivers/media/platform/qcom/vcodec/iris/resources.h

diff --git a/drivers/media/platform/qcom/vcodec/iris/Makefile b/drivers/media/platform/qcom/vcodec/iris/Makefile
index 5536ae0..0748819 100644
--- a/drivers/media/platform/qcom/vcodec/iris/Makefile
+++ b/drivers/media/platform/qcom/vcodec/iris/Makefile
@@ -1,3 +1,4 @@
-iris-objs += iris_probe.o
+iris-objs += iris_probe.o \
+ resources.o

obj-$(CONFIG_VIDEO_QCOM_IRIS) += iris.o
diff --git a/drivers/media/platform/qcom/vcodec/iris/iris_core.h b/drivers/media/platform/qcom/vcodec/iris/iris_core.h
index ab7fcee..c2bc95d 100644
--- a/drivers/media/platform/qcom/vcodec/iris/iris_core.h
+++ b/drivers/media/platform/qcom/vcodec/iris/iris_core.h
@@ -19,6 +19,14 @@
* @vdev_dec: iris video device structure for decoder
* @v4l2_file_ops: iris v4l2 file ops
* @v4l2_ioctl_ops: iris v4l2 ioctl ops
+ * @bus_tbl: table of iris buses
+ * @bus_count: count of iris buses
+ * @power_domain_tbl: table of iris power domains
+ * @pd_count: count of iris power domains
+ * @clock_tbl: table of iris clocks
+ * @clk_count: count of iris clocks
+ * @reset_tbl: table of iris reset clocks
+ * @reset_count: count of iris reset clocks
*/

struct iris_core {
@@ -29,6 +37,14 @@ struct iris_core {
struct video_device *vdev_dec;
const struct v4l2_file_operations *v4l2_file_ops;
const struct v4l2_ioctl_ops *v4l2_ioctl_ops;
+ struct bus_info *bus_tbl;
+ u32 bus_count;
+ struct power_domain_info *power_domain_tbl;
+ u32 pd_count;
+ struct clock_info *clock_tbl;
+ u32 clk_count;
+ struct reset_info *reset_tbl;
+ u32 reset_count;
};

#endif
diff --git a/drivers/media/platform/qcom/vcodec/iris/iris_probe.c b/drivers/media/platform/qcom/vcodec/iris/iris_probe.c
index 2e93118..7bb9c92 100644
--- a/drivers/media/platform/qcom/vcodec/iris/iris_probe.c
+++ b/drivers/media/platform/qcom/vcodec/iris/iris_probe.c
@@ -8,6 +8,7 @@
#include <linux/platform_device.h>

#include "iris_core.h"
+#include "resources.h"

static int iris_register_video_device(struct iris_core *core)
{
@@ -73,6 +74,13 @@ static int iris_probe(struct platform_device *pdev)
if (core->irq < 0)
return core->irq;

+ ret = init_resources(core);
+ if (ret) {
+ dev_err_probe(core->dev, ret,
+ "%s: init resource failed with %d\n", __func__, ret);
+ return ret;
+ }
+
ret = v4l2_device_register(dev, &core->v4l2_dev);
if (ret)
return ret;
diff --git a/drivers/media/platform/qcom/vcodec/iris/resources.c b/drivers/media/platform/qcom/vcodec/iris/resources.c
new file mode 100644
index 0000000..5aebbe4
--- /dev/null
+++ b/drivers/media/platform/qcom/vcodec/iris/resources.c
@@ -0,0 +1,232 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <dt-bindings/clock/qcom,sm8550-gcc.h>
+#include <dt-bindings/clock/qcom,sm8450-videocc.h>
+
+#include <linux/clk.h>
+#include <linux/interconnect.h>
+#include <linux/pm_domain.h>
+#include <linux/pm_opp.h>
+#include <linux/pm_runtime.h>
+#include <linux/reset.h>
+#include <linux/sort.h>
+
+#include "iris_core.h"
+#include "resources.h"
+
+static const struct bus_info plat_bus_table[] = {
+ { NULL, "iris-cnoc", 1000, 1000 },
+ { NULL, "iris-ddr", 1000, 15000000 },
+};
+
+static const char * const plat_pd_table[] = { "iris-ctl", "vcodec", NULL };
+#define PD_COUNT 2
+
+static const char * const plat_opp_pd_table[] = { "mxc", "mmcx", NULL };
+#define OPP_PD_COUNT 2
+
+static const struct clock_info plat_clk_table[] = {
+ { NULL, "gcc_video_axi0", GCC_VIDEO_AXI0_CLK, 0, 0 },
+ { NULL, "core_clk", VIDEO_CC_MVS0C_CLK, 0, 0 },
+ { NULL, "vcodec_core", VIDEO_CC_MVS0_CLK, 1, 0 },
+};
+
+static const char * const plat_clk_reset_table[] = { "video_axi_reset", NULL };
+#define RESET_COUNT 1
+
+static void iris_pd_release(void *res)
+{
+ struct device *pd = (struct device *)res;
+
+ dev_pm_domain_detach(pd, true);
+}
+
+static int iris_pd_get(struct iris_core *core, struct power_domain_info *pdinfo)
+{
+ int ret;
+
+ pdinfo->genpd_dev = dev_pm_domain_attach_by_name(core->dev, pdinfo->name);
+ if (IS_ERR_OR_NULL(pdinfo->genpd_dev))
+ ret = PTR_ERR(pdinfo->genpd_dev) ? : -ENODATA;
+
+ ret = devm_add_action_or_reset(core->dev, iris_pd_release, (void *)pdinfo->genpd_dev);
+ if (ret)
+ return ret;
+
+ return ret;
+}
+
+static void iris_opp_dl_release(void *res)
+{
+ struct device_link *link = (struct device_link *)res;
+
+ device_link_del(link);
+}
+
+static int iris_opp_dl_get(struct device *dev, struct device *supplier)
+{
+ u32 flag = DL_FLAG_RPM_ACTIVE | DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS;
+ struct device_link *link = NULL;
+ int ret;
+
+ link = device_link_add(dev, supplier, flag);
+ if (!link)
+ return -EINVAL;
+
+ ret = devm_add_action_or_reset(dev, iris_opp_dl_release, (void *)link);
+
+ return ret;
+}
+
+static int init_bus(struct iris_core *core)
+{
+ struct bus_info *binfo = NULL;
+ u32 i = 0;
+
+ core->bus_count = ARRAY_SIZE(plat_bus_table);
+ core->bus_tbl = devm_kzalloc(core->dev,
+ sizeof(struct bus_info) * core->bus_count,
+ GFP_KERNEL);
+ if (!core->bus_tbl)
+ return -ENOMEM;
+
+ for (i = 0; i < core->bus_count; i++) {
+ binfo = &core->bus_tbl[i];
+ binfo->name = plat_bus_table[i].name;
+ binfo->bw_min_kbps = plat_bus_table[i].bw_min_kbps;
+ binfo->bw_max_kbps = plat_bus_table[i].bw_max_kbps;
+ binfo->icc = devm_of_icc_get(core->dev, binfo->name);
+ if (IS_ERR(binfo->icc)) {
+ dev_err(core->dev,
+ "%s: failed to get bus: %s\n", __func__, binfo->name);
+ return PTR_ERR(binfo->icc);
+ }
+ }
+
+ return 0;
+}
+
+static int init_power_domains(struct iris_core *core)
+{
+ struct power_domain_info *pdinfo = NULL;
+ struct device **opp_vdevs = NULL;
+ int ret;
+ u32 i;
+
+ core->pd_count = PD_COUNT;
+ core->power_domain_tbl = devm_kzalloc(core->dev,
+ sizeof(struct power_domain_info) * core->pd_count,
+ GFP_KERNEL);
+ if (!core->power_domain_tbl)
+ return -ENOMEM;
+
+ for (i = 0; i < core->pd_count; i++) {
+ pdinfo = &core->power_domain_tbl[i];
+ pdinfo->name = plat_pd_table[i];
+ ret = iris_pd_get(core, pdinfo);
+ if (ret) {
+ dev_err(core->dev,
+ "%s: failed to get pd: %s\n", __func__, pdinfo->name);
+ return ret;
+ }
+ }
+
+ ret = devm_pm_opp_attach_genpd(core->dev, plat_opp_pd_table, &opp_vdevs);
+ if (ret)
+ return ret;
+
+ for (i = 0; i < OPP_PD_COUNT; i++) {
+ ret = iris_opp_dl_get(core->dev, opp_vdevs[i]);
+ if (ret) {
+ dev_err(core->dev, "%s: failed to create dl: %s\n",
+ __func__, dev_name(opp_vdevs[i]));
+ return ret;
+ }
+ }
+
+ ret = devm_pm_opp_of_add_table(core->dev);
+ if (ret) {
+ dev_err(core->dev, "%s: failed to add opp table\n", __func__);
+ return ret;
+ }
+
+ return ret;
+}
+
+static int init_clocks(struct iris_core *core)
+{
+ struct clock_info *cinfo = NULL;
+ u32 i;
+
+ core->clk_count = ARRAY_SIZE(plat_clk_table);
+ core->clock_tbl = devm_kzalloc(core->dev,
+ sizeof(struct clock_info) * core->clk_count,
+ GFP_KERNEL);
+ if (!core->clock_tbl)
+ return -ENOMEM;
+
+ for (i = 0; i < core->clk_count; i++) {
+ cinfo = &core->clock_tbl[i];
+ cinfo->name = plat_clk_table[i].name;
+ cinfo->clk_id = plat_clk_table[i].clk_id;
+ cinfo->has_scaling = plat_clk_table[i].has_scaling;
+ cinfo->clk = devm_clk_get(core->dev, cinfo->name);
+ if (IS_ERR(cinfo->clk)) {
+ dev_err(core->dev,
+ "%s: failed to get clock: %s\n", __func__, cinfo->name);
+ return PTR_ERR(cinfo->clk);
+ }
+ }
+
+ return 0;
+}
+
+static int init_reset_clocks(struct iris_core *core)
+{
+ struct reset_info *rinfo = NULL;
+ u32 i = 0;
+
+ core->reset_count = RESET_COUNT;
+ core->reset_tbl = devm_kzalloc(core->dev,
+ sizeof(struct reset_info) * core->reset_count,
+ GFP_KERNEL);
+ if (!core->reset_tbl)
+ return -ENOMEM;
+
+ for (i = 0; i < core->reset_count; i++) {
+ rinfo = &core->reset_tbl[i];
+ rinfo->name = plat_clk_reset_table[i];
+ rinfo->rst = devm_reset_control_get(core->dev, rinfo->name);
+ if (IS_ERR(rinfo->rst)) {
+ dev_err(core->dev,
+ "%s: failed to get reset clock: %s\n", __func__, rinfo->name);
+ return PTR_ERR(rinfo->rst);
+ }
+ }
+
+ return 0;
+}
+
+int init_resources(struct iris_core *core)
+{
+ int ret;
+
+ ret = init_bus(core);
+ if (ret)
+ return ret;
+
+ ret = init_power_domains(core);
+ if (ret)
+ return ret;
+
+ ret = init_clocks(core);
+ if (ret)
+ return ret;
+
+ ret = init_reset_clocks(core);
+
+ return ret;
+}
diff --git a/drivers/media/platform/qcom/vcodec/iris/resources.h b/drivers/media/platform/qcom/vcodec/iris/resources.h
new file mode 100644
index 0000000..d21bcc7e
--- /dev/null
+++ b/drivers/media/platform/qcom/vcodec/iris/resources.h
@@ -0,0 +1,36 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#ifndef _RESOURCES_H_
+#define _RESOURCES_H_
+
+struct bus_info {
+ struct icc_path *icc;
+ const char *name;
+ u32 bw_min_kbps;
+ u32 bw_max_kbps;
+};
+
+struct power_domain_info {
+ struct device *genpd_dev;
+ const char *name;
+};
+
+struct clock_info {
+ struct clk *clk;
+ const char *name;
+ u32 clk_id;
+ bool has_scaling;
+ u64 prev;
+};
+
+struct reset_info {
+ struct reset_control *rst;
+ const char *name;
+};
+
+int init_resources(struct iris_core *core);
+
+#endif
--
2.7.4



2023-12-18 15:09:29

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH v2 07/34] media: iris: initialize power resources

On 18.12.2023 12:32, Dikshita Agarwal wrote:
> Add support for initializing Iris "resources", which are clocks,
> interconnects, power domains, reset clocks, and clock frequencies
> used for Iris hardware.
>
> Signed-off-by: Dikshita Agarwal <[email protected]>
> ---
[...]

> + ret = init_resources(core);
> + if (ret) {
> + dev_err_probe(core->dev, ret,
> + "%s: init resource failed with %d\n", __func__, ret);
> + return ret;
You're supposed to return dev_err_probe, it propagates the errors
this way

Also, I think __func__ is excessive, throughout the code. You can
very quickly grep for the error messages, which are quite unique.

[...]

> +
> +static const struct bus_info plat_bus_table[] = {
> + { NULL, "iris-cnoc", 1000, 1000 },
> + { NULL, "iris-ddr", 1000, 15000000 },
> +};
> +
> +static const char * const plat_pd_table[] = { "iris-ctl", "vcodec", NULL };
> +#define PD_COUNT 2
> +
> +static const char * const plat_opp_pd_table[] = { "mxc", "mmcx", NULL };
> +#define OPP_PD_COUNT 2
> +
> +static const struct clock_info plat_clk_table[] = {
> + { NULL, "gcc_video_axi0", GCC_VIDEO_AXI0_CLK, 0, 0 },
> + { NULL, "core_clk", VIDEO_CC_MVS0C_CLK, 0, 0 },
> + { NULL, "vcodec_core", VIDEO_CC_MVS0_CLK, 1, 0 },
> +};
> +
> +static const char * const plat_clk_reset_table[] = { "video_axi_reset", NULL };
> +#define RESET_COUNT 1
Are you sure this won't change between platforms?
[...]

> +static int init_bus(struct iris_core *core)
> +{
> + struct bus_info *binfo = NULL;
> + u32 i = 0;
no need to initialize

[...]

> +static int init_clocks(struct iris_core *core)
> +{
> + struct clock_info *cinfo = NULL;
> + u32 i;
> +
> + core->clk_count = ARRAY_SIZE(plat_clk_table);
> + core->clock_tbl = devm_kzalloc(core->dev,
> + sizeof(struct clock_info) * core->clk_count,
> + GFP_KERNEL);
> + if (!core->clock_tbl)
> + return -ENOMEM;
> +
> + for (i = 0; i < core->clk_count; i++) {
> + cinfo = &core->clock_tbl[i];
> + cinfo->name = plat_clk_table[i].name;
> + cinfo->clk_id = plat_clk_table[i].clk_id;
> + cinfo->has_scaling = plat_clk_table[i].has_scaling;
> + cinfo->clk = devm_clk_get(core->dev, cinfo->name);
> + if (IS_ERR(cinfo->clk)) {
> + dev_err(core->dev,
> + "%s: failed to get clock: %s\n", __func__, cinfo->name);
> + return PTR_ERR(cinfo->clk);
> + }
> + }
Are you not going to use OPP for scaling the main RPMhPD with the core
clock?

> +
> + return 0;
> +}
> +
> +static int init_reset_clocks(struct iris_core *core)
init_resets

'reset clocks' is an old downstream concept

> +{
> + struct reset_info *rinfo = NULL;
> + u32 i = 0;
unnecessary initializations

[...]

> +
> +int init_resources(struct iris_core *core)
> +{
> + int ret;
> +
> + ret = init_bus(core);
> + if (ret)
> + return ret;
> +
> + ret = init_power_domains(core);
> + if (ret)
> + return ret;
> +
> + ret = init_clocks(core);
> + if (ret)
> + return ret;
> +
> + ret = init_reset_clocks(core);
> +
> + return ret;
return init_reset_clocks(core);

> +}
> diff --git a/drivers/media/platform/qcom/vcodec/iris/resources.h b/drivers/media/platform/qcom/vcodec/iris/resources.h
> new file mode 100644
> index 0000000..d21bcc7e
> --- /dev/null
> +++ b/drivers/media/platform/qcom/vcodec/iris/resources.h
> @@ -0,0 +1,36 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef _RESOURCES_H_
> +#define _RESOURCES_H_
> +
> +struct bus_info {
> + struct icc_path *icc;
> + const char *name;
> + u32 bw_min_kbps;
> + u32 bw_max_kbps;
u64?

> +};
> +
> +struct power_domain_info {
> + struct device *genpd_dev;
> + const char *name;
> +};
> +
> +struct clock_info {
> + struct clk *clk;
> + const char *name;
I'm not sure why you need it

> + u32 clk_id;
Or this

> + bool has_scaling;
Or this

you could probably do something like this:

struct big_iris_struct {
[...]
struct clk *core_clk;
struct clk *memory_clk;
struct clk *some_important_scaled_clock;
struct clk_bulk_data less_important_nonscaling_clocks[X]
}

and then make use of all of the great common upstream APIs to manage
them!

> + u64 prev;
> +};
> +
> +struct reset_info {
> + struct reset_control *rst;
> + const char *name;
this seems a bit excessive as well

Konrad

2023-12-20 08:05:08

by Dikshita Agarwal

[permalink] [raw]
Subject: Re: [PATCH v2 07/34] media: iris: initialize power resources



On 12/18/2023 8:39 PM, Konrad Dybcio wrote:
> On 18.12.2023 12:32, Dikshita Agarwal wrote:
>> Add support for initializing Iris "resources", which are clocks,
>> interconnects, power domains, reset clocks, and clock frequencies
>> used for Iris hardware.
>>
>> Signed-off-by: Dikshita Agarwal <[email protected]>
>> ---
> [...]
>
>> + ret = init_resources(core);
>> + if (ret) {
>> + dev_err_probe(core->dev, ret,
>> + "%s: init resource failed with %d\n", __func__, ret);
>> + return ret;
> You're supposed to return dev_err_probe, it propagates the errors
> this way
>
Sure, fix this.
> Also, I think __func__ is excessive, throughout the code. You can
> very quickly grep for the error messages, which are quite unique.
>
Ok, will remove __func__
> [...]
>
>> +
>> +static const struct bus_info plat_bus_table[] = {
>> + { NULL, "iris-cnoc", 1000, 1000 },
>> + { NULL, "iris-ddr", 1000, 15000000 },
>> +};
>> +
>> +static const char * const plat_pd_table[] = { "iris-ctl", "vcodec", NULL };
>> +#define PD_COUNT 2
>> +
>> +static const char * const plat_opp_pd_table[] = { "mxc", "mmcx", NULL };
>> +#define OPP_PD_COUNT 2
>> +
>> +static const struct clock_info plat_clk_table[] = {
>> + { NULL, "gcc_video_axi0", GCC_VIDEO_AXI0_CLK, 0, 0 },
>> + { NULL, "core_clk", VIDEO_CC_MVS0C_CLK, 0, 0 },
>> + { NULL, "vcodec_core", VIDEO_CC_MVS0_CLK, 1, 0 },
>> +};
>> +
>> +static const char * const plat_clk_reset_table[] = { "video_axi_reset", NULL };
>> +#define RESET_COUNT 1
> Are you sure this won't change between platforms?
> [...]
>
yes, these will change, but since at this point in the patches, I have not
introduced platform specific file, added these tables here.
I am moving these to platform specific file when I introduce that in
patch-13 [1].

[1]
https://patchwork.kernel.org/project/linux-media/patch/[email protected]/
>> +static int init_bus(struct iris_core *core)
>> +{
>> + struct bus_info *binfo = NULL;
>> + u32 i = 0;
> no need to initialize
>
Sure, will fix.
> [...]
>
>> +static int init_clocks(struct iris_core *core)
>> +{
>> + struct clock_info *cinfo = NULL;
>> + u32 i;
>> +
>> + core->clk_count = ARRAY_SIZE(plat_clk_table);
>> + core->clock_tbl = devm_kzalloc(core->dev,
>> + sizeof(struct clock_info) * core->clk_count,
>> + GFP_KERNEL);
>> + if (!core->clock_tbl)
>> + return -ENOMEM;
>> +
>> + for (i = 0; i < core->clk_count; i++) {
>> + cinfo = &core->clock_tbl[i];
>> + cinfo->name = plat_clk_table[i].name;
>> + cinfo->clk_id = plat_clk_table[i].clk_id;
>> + cinfo->has_scaling = plat_clk_table[i].has_scaling;
>> + cinfo->clk = devm_clk_get(core->dev, cinfo->name);
>> + if (IS_ERR(cinfo->clk)) {
>> + dev_err(core->dev,
>> + "%s: failed to get clock: %s\n", __func__, cinfo->name);
>> + return PTR_ERR(cinfo->clk);
>> + }
>> + }
> Are you not going to use OPP for scaling the main RPMhPD with the core
> clock?
>
We are using OPP for scaling the vcodec clk.
Could you please elaborate you query here, may be I didn't understand fully.
>> +
>> + return 0;
>> +}
>> +
>> +static int init_reset_clocks(struct iris_core *core)
> init_resets
>
> 'reset clocks' is an old downstream concept
>
Sure, I can rename it.
>> +{
>> + struct reset_info *rinfo = NULL;
>> + u32 i = 0;
> unnecessary initializations
>
Sure, will fix.
> [...]
>
>> +
>> +int init_resources(struct iris_core *core)
>> +{
>> + int ret;
>> +
>> + ret = init_bus(core);
>> + if (ret)
>> + return ret;
>> +
>> + ret = init_power_domains(core);
>> + if (ret)
>> + return ret;
>> +
>> + ret = init_clocks(core);
>> + if (ret)
>> + return ret;
>> +
>> + ret = init_reset_clocks(core);
>> +
>> + return ret;
> return init_reset_clocks(core);
>
>> +}
>> diff --git a/drivers/media/platform/qcom/vcodec/iris/resources.h b/drivers/media/platform/qcom/vcodec/iris/resources.h
>> new file mode 100644
>> index 0000000..d21bcc7e
>> --- /dev/null
>> +++ b/drivers/media/platform/qcom/vcodec/iris/resources.h
>> @@ -0,0 +1,36 @@
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>> +/*
>> + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
>> + */
>> +
>> +#ifndef _RESOURCES_H_
>> +#define _RESOURCES_H_
>> +
>> +struct bus_info {
>> + struct icc_path *icc;
>> + const char *name;
>> + u32 bw_min_kbps;
>> + u32 bw_max_kbps;
> u64?
>
Will check and do the needful.
>> +};
>> +
>> +struct power_domain_info {
>> + struct device *genpd_dev;
>> + const char *name;
>> +};
>> +
>> +struct clock_info {
>> + struct clk *clk;
>> + const char *name;
> I'm not sure why you need it
>
>> + u32 clk_id;
> Or this
>
>> + bool has_scaling;
> Or this
>
> you could probably do something like this:
>
> struct big_iris_struct {
> [...]
> struct clk *core_clk;
> struct clk *memory_clk;
> struct clk *some_important_scaled_clock;
> struct clk_bulk_data less_important_nonscaling_clocks[X]
> }
>
> and then make use of all of the great common upstream APIs to manage
> them!
>
Will explore this and get back.
>> + u64 prev;
>> +};
>> +
>> +struct reset_info {
>> + struct reset_control *rst;
>> + const char *name;
> this seems a bit excessive as well
>
> Konrad

2024-01-03 13:45:32

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH v2 07/34] media: iris: initialize power resources

On 20.12.2023 09:04, Dikshita Agarwal wrote:
>
>
> On 12/18/2023 8:39 PM, Konrad Dybcio wrote:
>> On 18.12.2023 12:32, Dikshita Agarwal wrote:
>>> Add support for initializing Iris "resources", which are clocks,
>>> interconnects, power domains, reset clocks, and clock frequencies
>>> used for Iris hardware.
>>>
>>> Signed-off-by: Dikshita Agarwal <[email protected]>
>>> ---
[...]

>>> +
>>> + for (i = 0; i < core->clk_count; i++) {
>>> + cinfo = &core->clock_tbl[i];
>>> + cinfo->name = plat_clk_table[i].name;
>>> + cinfo->clk_id = plat_clk_table[i].clk_id;
>>> + cinfo->has_scaling = plat_clk_table[i].has_scaling;
>>> + cinfo->clk = devm_clk_get(core->dev, cinfo->name);
>>> + if (IS_ERR(cinfo->clk)) {
>>> + dev_err(core->dev,
>>> + "%s: failed to get clock: %s\n", __func__, cinfo->name);
>>> + return PTR_ERR(cinfo->clk);
>>> + }
>>> + }
>> Are you not going to use OPP for scaling the main RPMhPD with the core
>> clock?
>>
> We are using OPP for scaling the vcodec clk.
> Could you please elaborate you query here, may be I didn't understand fully.

It's just that this approach of scanning everything we know and
expect about the clock seems a bit unnecessary.. Going with the
approach I suggested below (i.e. separate struct clk for important
ones like core or mem clock) simplify this to the point where you
just set opp_set_rate on the imporant ones and you can throw
clk_bulk_ operations at the ones that simply need to be en/disabled.

Konrad

[...]

>>> +
>>> +struct power_domain_info {
>>> + struct device *genpd_dev;
>>> + const char *name;
>>> +};
>>> +
>>> +struct clock_info {
>>> + struct clk *clk;
>>> + const char *name;
>> I'm not sure why you need it
>>
>>> + u32 clk_id;
>> Or this
>>
>>> + bool has_scaling;
>> Or this
>>
>> you could probably do something like this:
>>
>> struct big_iris_struct {
>> [...]
>> struct clk *core_clk;
>> struct clk *memory_clk;
>> struct clk *some_important_scaled_clock;
>> struct clk_bulk_data less_important_nonscaling_clocks[X]
>> }
>>
>> and then make use of all of the great common upstream APIs to manage
>> them!
>>
> Will explore this and get back.