On 30/05/2025 10:00, Vincent Knecht via B4 Relay wrote:
> From: Vincent Knecht <vincent.kne...@mailoo.org>
>
> Some devices need writing values to VFE VBIF registers.
> Add helper functions to do this.
>
> Signed-off-by: Vincent Knecht <vincent.kne...@mailoo.org>
> ---
> drivers/media/platform/qcom/camss/Makefile | 1 +
> drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 12 +++++++++++
> drivers/media/platform/qcom/camss/camss-vfe-vbif.c | 25
> ++++++++++++++++++++++
> drivers/media/platform/qcom/camss/camss-vfe-vbif.h | 19 ++++++++++++++++
> drivers/media/platform/qcom/camss/camss-vfe.c | 9 ++++++++
> drivers/media/platform/qcom/camss/camss-vfe.h | 3 +++
> 6 files changed, 69 insertions(+)
>
> diff --git a/drivers/media/platform/qcom/camss/Makefile
> b/drivers/media/platform/qcom/camss/Makefile
> index
> d26a9c24a430a831e0d865db4d96142da5276653..4c66d29ae505ae5adc717ae98f77fb736a6e15b9
> 100644
> --- a/drivers/media/platform/qcom/camss/Makefile
> +++ b/drivers/media/platform/qcom/camss/Makefile
> @@ -21,6 +21,7 @@ qcom-camss-objs += \
> camss-vfe-680.o \
> camss-vfe-780.o \
> camss-vfe-gen1.o \
> + camss-vfe-vbif.o \
> camss-vfe.o \
> camss-video.o \
> camss-format.o \
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
> b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
> index
> 901677293d971cf761944a660ef719af38203f22..9cf1ccdb2fe7ca9bf89b746af836e1035b457a8f
> 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
> @@ -15,6 +15,7 @@
> #include "camss.h"
> #include "camss-vfe.h"
> #include "camss-vfe-gen1.h"
> +#include "camss-vfe-vbif.h"
>
> #define VFE_0_HW_VERSION 0x000
>
> @@ -733,6 +734,7 @@ static void vfe_set_qos(struct vfe_device *vfe)
> {
> u32 val = VFE_0_BUS_BDG_QOS_CFG_0_CFG;
> u32 val7 = VFE_0_BUS_BDG_QOS_CFG_7_CFG;
> + int ret;
>
> writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_0);
> writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_1);
> @@ -742,6 +744,16 @@ static void vfe_set_qos(struct vfe_device *vfe)
> writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_5);
> writel_relaxed(val, vfe->base + VFE_0_BUS_BDG_QOS_CFG_6);
> writel_relaxed(val7, vfe->base + VFE_0_BUS_BDG_QOS_CFG_7);
> +
> + /* SoC-specific VBIF settings */
> + if (vfe->res->has_vbif) {
> + ret = vfe_vbif_apply_settings(vfe);
> + if (ret < 0) {
> + dev_err_ratelimited(vfe->camss->dev,
> + "VFE: VBIF error %d\n",
> + ret);
> + }
> + }
> }
>
> static void vfe_set_ds(struct vfe_device *vfe)
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-vbif.c
> b/drivers/media/platform/qcom/camss/camss-vfe-vbif.c
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..691335f231a6001e6c535431a18b2e21ddc832c9
> --- /dev/null
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-vbif.c
> @@ -0,0 +1,25 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * camss-vfe-vbif.c
> + *
> + * Qualcomm MSM Camera Subsystem - VFE VBIF Module
> + *
> + * Copyright (c) 2025, The Linux Foundation. All rights reserved.
> + *
> + */
> +
> +#include <linux/io.h>
> +
> +#include "camss.h"
> +#include "camss-vfe.h"
> +#include "camss-vfe-vbif.h"
> +
> +void vfe_vbif_write_reg(struct vfe_device *vfe, u32 reg, u32 val)
> +{
> + writel_relaxed(val, vfe->vbif_base + reg);
> +}
> +
> +int vfe_vbif_apply_settings(struct vfe_device *vfe)
> +{
> + return 0;
> +}
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-vbif.h
> b/drivers/media/platform/qcom/camss/camss-vfe-vbif.h
> new file mode 100644
> index
> 0000000000000000000000000000000000000000..502db629e961f67723b14a7c8c9ca973fe4c267c
> --- /dev/null
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-vbif.h
> @@ -0,0 +1,19 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * camss-vfe-vbif.h
> + *
> + * Qualcomm MSM Camera Subsystem - VFE VBIF Module
> + *
> + * Copyright (c) 2025, The Linux Foundation. All rights reserved.
> + *
> + */
> +#ifndef QC_MSM_CAMSS_VFE_VBIF_H
> +#define QC_MSM_CAMSS_VFE_VBIF_H
> +
> +#include "camss-vfe.h"
> +
> +void vfe_vbif_write_reg(struct vfe_device *vfe, u32 reg, u32 val);
> +
> +int vfe_vbif_apply_settings(struct vfe_device *vfe);
> +
> +#endif /* QC_MSM_CAMSS_VFE_VBIF_H */
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c
> b/drivers/media/platform/qcom/camss/camss-vfe.c
> index
> 4bca6c3abaff9b898ea879674a3ff8f3592d3139..3138562d399444c5cf2ae96bf16b75b85ff5c5ca
> 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -1807,6 +1807,15 @@ int msm_vfe_subdev_init(struct camss *camss, struct
> vfe_device *vfe,
> return PTR_ERR(vfe->base);
> }
>
> + if (vfe->res->has_vbif) {
> + vfe->vbif_base = devm_platform_ioremap_resource_byname(pdev,
> + vfe->res->vbif_name);
bad alignment
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#71:
new file mode 100644
CHECK: Alignment should match open parenthesis
#136: FILE: drivers/media/platform/qcom/camss/camss-vfe.c:1812:
+ vfe->vbif_base = devm_platform_ioremap_resource_byname(pdev,
+ vfe->res->vbif_name);
its trivial I can fix it for you when applying no need to resend
> + if (IS_ERR(vfe->vbif_base)) {
> + dev_err(dev, "could not map vbif memory\n");
> + return PTR_ERR(vfe->vbif_base);
> + }
> + }
> +
> /* Interrupt */
>
> ret = platform_get_irq_byname(pdev, res->interrupt[0]);
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h
> b/drivers/media/platform/qcom/camss/camss-vfe.h
> index
> a23f666be7531e0366c73faea44ed245e7a8e30f..614e932c33da78e02e0800ce6534af7b14822f83
> 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.h
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.h
> @@ -136,6 +136,8 @@ struct vfe_subdev_resources {
> u8 line_num;
> bool has_pd;
> char *pd_name;
> + bool has_vbif;
> + char *vbif_name;
> const struct vfe_hw_ops *hw_ops;
> const struct camss_formats *formats_rdi;
> const struct camss_formats *formats_pix;
> @@ -145,6 +147,7 @@ struct vfe_device {
> struct camss *camss;
> u8 id;
> void __iomem *base;
> + void __iomem *vbif_base;
> u32 irq;
> char irq_name[30];
> struct camss_clock *clock;
>
> --
> 2.49.0
>
>
>Reviewed-by: Bryan O'Donoghue <bryan.odonog...@linaro.org>
