Re: [PATCH v2, 01/14] media: mtk-vcodec: Get numbers of register bases from DT

Dafna Hirschfeld
2021-07-19T07:07:11Z

On 17.07.21 10:12, Yunfei Dong wrote:
> Different platform may has different numbers of register bases. Gets the
> numbers of register bases from DT (sizeof(u32) * 4 bytes for each).
>
> Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
> ---
> v2: no changes
> ---
> .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 38 ++++++++++++++-----
> 1 file changed, 29 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> index 55ae198dbcf9..d3f34cd04759 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> @@ -78,6 +78,31 @@ static irqreturn_t mtk_vcodec_dec_irq_handler(int irq, void *priv)
> return IRQ_HANDLED;
> }
>
> +static int mtk_vcodec_get_reg_bases(struct mtk_vcodec_dev *dev)
> +{
> + struct platform_device *pdev = dev->plat_dev;
> + int reg_num, i, ret = 0;
> +
> + /* Sizeof(u32) * 4 bytes for each register base. */
> + reg_num = of_property_count_elems_of_size(pdev->dev.of_node, "reg",
> + sizeof(u32) * 4);

'reg_num' can also be negative if the 'of_..' function fails. So this case should
also be checked

> + if (!reg_num || reg_num > NUM_MAX_VDEC_REG_BASE) {
> + dev_err(&pdev->dev, "Invalid register property size: %d\n", reg_num);
> + return -EINVAL;
> + }
> +
> + for (i = 0; i < reg_num; i++) {
> + dev->reg_base[i] = devm_platform_ioremap_resource(pdev, i);
> + if (IS_ERR((__force void *)dev->reg_base[i])) {
> + ret = PTR_ERR((__force void *)dev->reg_base[i]);
> + break;

you can replace this two lines with "return PTR_ERR((__force void *)dev->reg_base[i]);"

thanks,
Dafna

> + }
> + mtk_v4l2_debug(2, "reg[%d] base=%p", i, dev->reg_base[i]);
> + }
> +
> + return ret;
> +}
> +
> static int fops_vcodec_open(struct file *file)
> {
> struct mtk_vcodec_dev *dev = video_drvdata(file);
> @@ -206,7 +231,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> struct resource *res;
> phandle rproc_phandle;
> enum mtk_vcodec_fw_type fw_type;
> - int i, ret;
> + int ret;
>
> dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
> if (!dev)
> @@ -238,14 +263,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> goto err_dec_pm;
> }
>
> - for (i = 0; i < NUM_MAX_VDEC_REG_BASE; i++) {
> - dev->reg_base[i] = devm_platform_ioremap_resource(pdev, i);
> - if (IS_ERR((__force void *)dev->reg_base[i])) {
> - ret = PTR_ERR((__force void *)dev->reg_base[i]);
> - goto err_res;
> - }
> - mtk_v4l2_debug(2, "reg[%d] base=%p", i, dev->reg_base[i]);
> - }
> + ret = mtk_vcodec_get_reg_bases(dev);
> + if (ret)
> + goto err_res;
>
> res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
> if (res == NULL) {
>