| 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: <f3415ec4-fb56-49d9-a326-ed05c5346822@ideasonboard.com>
Date: Mon, 8 Jan 2024 13:30:12 +0200
From: Tomi Valkeinen <tomi.valkeinen@...asonboard.com>
To: Paul Elder <paul.elder@...asonboard.com>, linux-media@...r.kernel.org,
linux-rockchip@...ts.infradead.org, devicetree@...r.kernel.org
Cc: kieran.bingham@...asonboard.com, umang.jain@...asonboard.com,
aford173@...il.com, Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Alexander Stein <alexander.stein@...tq-group.com>,
Dafna Hirschfeld <dafna@...tmail.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>, Heiko Stuebner
<heiko@...ech.de>,
"moderated list:ARM/Rockchip SoC support"
<linux-arm-kernel@...ts.infradead.org>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v5 07/10] media: rkisp1: Configure gasket on i.MX8MP
On 06/01/2024 18:02, Paul Elder wrote:
> From: Laurent Pinchart <laurent.pinchart@...asonboard.com>
>
> The i.MX8MP has a gasket between the CSI-2 receiver and the ISP.
> Configure and enable it when starting the ISP, and disable it when
> stopping.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
> Signed-off-by: Paul Elder <paul.elder@...asonboard.com>
> Tested-by: Alexander Stein <alexander.stein@...tq-group.com>
> Tested-by: Adam Ford <aford173@...il.com>
> ---
> .../platform/rockchip/rkisp1/rkisp1-common.h | 5 +
> .../platform/rockchip/rkisp1/rkisp1-dev.c | 16 +++
> .../platform/rockchip/rkisp1/rkisp1-isp.c | 131 +++++++++++++++++-
> 3 files changed, 149 insertions(+), 3 deletions(-)
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@...asonboard.com>
Tomi
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> index 219d4a2547aa..69940014d597 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> @@ -24,6 +24,7 @@
> #include "rkisp1-regs.h"
>
> struct dentry;
> +struct regmap;
>
> /*
> * flags on the 'direction' field in struct rkisp1_mbus_info' that indicate
> @@ -444,6 +445,8 @@ struct rkisp1_debug {
> * @dev: a pointer to the struct device
> * @clk_size: number of clocks
> * @clks: array of clocks
> + * @gasket: the gasket - i.MX8MP only
> + * @gasket_id: the gasket ID (0 or 1) - i.MX8MP only
> * @v4l2_dev: v4l2_device variable
> * @media_dev: media_device variable
> * @notifier: a notifier to register on the v4l2-async API to be notified on the sensor
> @@ -466,6 +469,8 @@ struct rkisp1_device {
> struct device *dev;
> unsigned int clk_size;
> struct clk_bulk_data clks[RKISP1_MAX_BUS_CLK];
> + struct regmap *gasket;
> + unsigned int gasket_id;
> struct v4l2_device v4l2_dev;
> struct media_device media_dev;
> struct v4l2_async_notifier notifier;
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index 29a8249852d4..01f811b9f9a5 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -10,6 +10,7 @@
>
> #include <linux/clk.h>
> #include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/of_graph.h>
> @@ -624,6 +625,21 @@ static int rkisp1_probe(struct platform_device *pdev)
> return ret;
> rkisp1->clk_size = info->clk_size;
>
> + if (info->isp_ver == IMX8MP_V10) {
> + unsigned int id;
> +
> + rkisp1->gasket = syscon_regmap_lookup_by_phandle_args(dev->of_node,
> + "fsl,blk-ctrl",
> + 1, &id);
> + if (IS_ERR(rkisp1->gasket)) {
> + ret = PTR_ERR(rkisp1->gasket);
> + dev_err(dev, "failed to get gasket: %d\n", ret);
> + return ret;
> + }
> +
> + rkisp1->gasket_id = id;
> + }
> +
> pm_runtime_enable(&pdev->dev);
>
> ret = pm_runtime_resume_and_get(&pdev->dev);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 78a1f7a1499b..bfd6dc3559cc 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -10,6 +10,7 @@
>
> #include <linux/iopoll.h>
> #include <linux/pm_runtime.h>
> +#include <linux/regmap.h>
> #include <linux/videodev2.h>
> #include <linux/vmalloc.h>
>
> @@ -53,6 +54,115 @@
> * +---------------------------------------------------------+
> */
>
> +/* -----------------------------------------------------------------------------
> + * Media block control (i.MX8MP only)
> + */
> +
> +#define ISP_DEWARP_CONTROL 0x0138
> +
> +#define ISP_DEWARP_CONTROL_MIPI_CSI2_HS_POLARITY BIT(22)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI2_VS_SEL_RISING (0 << 20)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI2_VS_SEL_NEGATIVE (1 << 20)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI2_VS_SEL_POSITIVE (2 << 20)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI2_VS_SEL_FALLING (3 << 20)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI2_VS_SEL_MASK GENMASK(21, 20)
> +#define ISP_DEWARP_CONTROL_MIPI_ISP2_LEFT_JUST_MODE BIT(19)
> +#define ISP_DEWARP_CONTROL_MIPI_ISP2_DATA_TYPE(dt) ((dt) << 13)
> +#define ISP_DEWARP_CONTROL_MIPI_ISP2_DATA_TYPE_MASK GENMASK(18, 13)
> +
> +#define ISP_DEWARP_CONTROL_MIPI_CSI1_HS_POLARITY BIT(12)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI1_VS_SEL_RISING (0 << 10)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI1_VS_SEL_NEGATIVE (1 << 10)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI1_VS_SEL_POSITIVE (2 << 10)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI1_VS_SEL_FALLING (3 << 10)
> +#define ISP_DEWARP_CONTROL_MIPI_CSI1_VS_SEL_MASK GENMASK(11, 10)
> +#define ISP_DEWARP_CONTROL_MIPI_ISP1_LEFT_JUST_MODE BIT(9)
> +#define ISP_DEWARP_CONTROL_MIPI_ISP1_DATA_TYPE(dt) ((dt) << 3)
> +#define ISP_DEWARP_CONTROL_MIPI_ISP1_DATA_TYPE_MASK GENMASK(8, 3)
> +
> +#define ISP_DEWARP_CONTROL_GPR_ISP_1_DISABLE BIT(1)
> +#define ISP_DEWARP_CONTROL_GPR_ISP_0_DISABLE BIT(0)
> +
> +static int rkisp1_gasket_enable(struct rkisp1_device *rkisp1,
> + struct media_pad *source)
> +{
> + struct v4l2_subdev *source_sd;
> + struct v4l2_mbus_frame_desc fd;
> + unsigned int dt;
> + u32 mask;
> + u32 val;
> + int ret;
> +
> + /*
> + * Configure and enable the gasket with the CSI-2 data type. Set the
> + * vsync polarity as active high, as that is what the ISP is configured
> + * to expect in ISP_ACQ_PROP. Enable left justification, as the i.MX8MP
> + * ISP has a 16-bit wide input and expects data to be left-aligned.
> + */
> +
> + source_sd = media_entity_to_v4l2_subdev(source->entity);
> + ret = v4l2_subdev_call(source_sd, pad, get_frame_desc,
> + source->index, &fd);
> + if (ret) {
> + dev_err(rkisp1->dev,
> + "failed to get frame descriptor from '%s':%u: %d\n",
> + source_sd->name, 0, ret);
> + return ret;
> + }
> +
> + if (fd.num_entries != 1) {
> + dev_err(rkisp1->dev, "invalid frame descriptor for '%s':%u\n",
> + source_sd->name, 0);
> + return -EINVAL;
> + }
> +
> + dt = fd.entry[0].bus.csi2.dt;
> +
> + if (rkisp1->gasket_id == 0) {
> + mask = ISP_DEWARP_CONTROL_MIPI_CSI1_HS_POLARITY
> + | ISP_DEWARP_CONTROL_MIPI_CSI1_VS_SEL_MASK
> + | ISP_DEWARP_CONTROL_MIPI_ISP1_LEFT_JUST_MODE
> + | ISP_DEWARP_CONTROL_MIPI_ISP1_DATA_TYPE_MASK
> + | ISP_DEWARP_CONTROL_GPR_ISP_0_DISABLE;
> + val = ISP_DEWARP_CONTROL_MIPI_CSI1_VS_SEL_POSITIVE
> + | ISP_DEWARP_CONTROL_MIPI_ISP1_LEFT_JUST_MODE
> + | ISP_DEWARP_CONTROL_MIPI_ISP1_DATA_TYPE(dt);
> + } else {
> + mask = ISP_DEWARP_CONTROL_MIPI_CSI2_HS_POLARITY
> + | ISP_DEWARP_CONTROL_MIPI_CSI2_VS_SEL_MASK
> + | ISP_DEWARP_CONTROL_MIPI_ISP2_LEFT_JUST_MODE
> + | ISP_DEWARP_CONTROL_MIPI_ISP2_DATA_TYPE_MASK
> + | ISP_DEWARP_CONTROL_GPR_ISP_1_DISABLE;
> + val = ISP_DEWARP_CONTROL_MIPI_CSI2_VS_SEL_POSITIVE
> + | ISP_DEWARP_CONTROL_MIPI_ISP2_LEFT_JUST_MODE
> + | ISP_DEWARP_CONTROL_MIPI_ISP2_DATA_TYPE(dt);
> + }
> +
> + regmap_update_bits(rkisp1->gasket, ISP_DEWARP_CONTROL, mask, val);
> +
> + return 0;
> +}
> +
> +static void rkisp1_gasket_disable(struct rkisp1_device *rkisp1)
> +{
> + u32 mask;
> + u32 val;
> +
> + if (rkisp1->gasket_id == 1) {
> + mask = ISP_DEWARP_CONTROL_MIPI_ISP2_LEFT_JUST_MODE
> + | ISP_DEWARP_CONTROL_MIPI_ISP2_DATA_TYPE_MASK
> + | ISP_DEWARP_CONTROL_GPR_ISP_1_DISABLE;
> + val = ISP_DEWARP_CONTROL_GPR_ISP_1_DISABLE;
> + } else {
> + mask = ISP_DEWARP_CONTROL_MIPI_ISP1_LEFT_JUST_MODE
> + | ISP_DEWARP_CONTROL_MIPI_ISP1_DATA_TYPE_MASK
> + | ISP_DEWARP_CONTROL_GPR_ISP_0_DISABLE;
> + val = ISP_DEWARP_CONTROL_GPR_ISP_0_DISABLE;
> + }
> +
> + regmap_update_bits(rkisp1->gasket, ISP_DEWARP_CONTROL, mask, val);
> +}
> +
> /* ----------------------------------------------------------------------------
> * Camera Interface registers configurations
> */
> @@ -291,6 +401,9 @@ static void rkisp1_isp_stop(struct rkisp1_isp *isp)
> RKISP1_CIF_VI_IRCL_MIPI_SW_RST |
> RKISP1_CIF_VI_IRCL_ISP_SW_RST);
> rkisp1_write(rkisp1, RKISP1_CIF_VI_IRCL, 0x0);
> +
> + if (rkisp1->info->isp_ver == IMX8MP_V10)
> + rkisp1_gasket_disable(rkisp1);
> }
>
> static void rkisp1_config_clk(struct rkisp1_isp *isp)
> @@ -315,16 +428,24 @@ static void rkisp1_config_clk(struct rkisp1_isp *isp)
> }
> }
>
> -static void rkisp1_isp_start(struct rkisp1_isp *isp,
> - struct v4l2_subdev_state *sd_state)
> +static int rkisp1_isp_start(struct rkisp1_isp *isp,
> + struct v4l2_subdev_state *sd_state,
> + struct media_pad *source)
> {
> struct rkisp1_device *rkisp1 = isp->rkisp1;
> const struct v4l2_mbus_framefmt *src_fmt;
> const struct rkisp1_mbus_info *src_info;
> u32 val;
> + int ret;
>
> rkisp1_config_clk(isp);
>
> + if (rkisp1->info->isp_ver == IMX8MP_V10) {
> + ret = rkisp1_gasket_enable(rkisp1, source);
> + if (ret)
> + return ret;
> + }
> +
> /* Activate ISP */
> val = rkisp1_read(rkisp1, RKISP1_CIF_ISP_CTRL);
> val |= RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD |
> @@ -338,6 +459,8 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> rkisp1_params_post_configure(&rkisp1->params);
> +
> + return 0;
> }
>
> /* ----------------------------------------------------------------------------
> @@ -848,7 +971,9 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable)
> if (ret)
> goto out_unlock;
>
> - rkisp1_isp_start(isp, sd_state);
> + ret = rkisp1_isp_start(isp, sd_state, source_pad);
> + if (ret)
> + goto out_unlock;
>
> ret = v4l2_subdev_call(rkisp1->source, video, s_stream, true);
> if (ret) {
Powered by blists - more mailing lists