Hi Laurent,
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Sent: 2023年6月29日 5:14
> To: G.N. Zhou (OSS) <guoniu.zhou@xxxxxxxxxxx>
> Cc: linux-media@xxxxxxxxxxxxxxx; dl-linux-imx <linux-imx@xxxxxxx>;
> devicetree@xxxxxxxxxxxxxxx; mchehab@xxxxxxxxxx; robh+dt@xxxxxxxxxx;
> krzysztof.kozlowski+dt@xxxxxxxxxx; conor+dt@xxxxxxxxxx; Xavier Roumegue
> (OSS) <xavier.roumegue@xxxxxxxxxxx>; kernel@xxxxxxxxxxxxxx;
> jacopo.mondi@xxxxxxxxxxxxxxxx; sakari.ailus@xxxxxxxxxxxxxxx
> Subject: Re: [PATCH v4 2/3] media: nxp: imx8-isi: move i.MX8 gasket
> configuration to an ops structure
>
> Caution: This is an external email. Please take care when clicking links or opening
> attachments. When in doubt, report the message using the 'Report this email'
> button
>
>
> Hi Guoniu,
>
> Thank you for the patch.
>
> On Wed, Jun 28, 2023 at 02:42:50PM +0800, guoniu.zhou@xxxxxxxxxxx wrote:
> > From: "Guoniu.zhou" <guoniu.zhou@xxxxxxx>
> >
> > The i.MX93 includes an ISI instance compatible with the imx8-isi
> > driver, but with a different gasket. To prepare for this, make the
> > gasket configuration modular by moving the code to an ops structure.
> >
> > Signed-off-by: Guoniu.zhou <guoniu.zhou@xxxxxxx>
> > ---
> > drivers/media/platform/nxp/imx8-isi/Makefile | 4 +-
> > .../platform/nxp/imx8-isi/imx8-isi-core.c | 9 ++--
> > .../platform/nxp/imx8-isi/imx8-isi-core.h | 20 +++----
> > .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 40 +++-----------
> > .../platform/nxp/imx8-isi/imx8-isi-gasket.c | 52 +++++++++++++++++++
> > 5 files changed, 74 insertions(+), 51 deletions(-)
> >
> > diff --git a/drivers/media/platform/nxp/imx8-isi/Makefile
> > b/drivers/media/platform/nxp/imx8-isi/Makefile
> > index 9bff9297686d..4713c4e8b64b 100644
> > --- a/drivers/media/platform/nxp/imx8-isi/Makefile
> > +++ b/drivers/media/platform/nxp/imx8-isi/Makefile
> > @@ -1,7 +1,7 @@
> > # SPDX-License-Identifier: GPL-2.0-only
> >
> > -imx8-isi-y := imx8-isi-core.o imx8-isi-crossbar.o imx8-isi-hw.o \
> > - imx8-isi-pipe.o imx8-isi-video.o
> > +imx8-isi-y := imx8-isi-core.o imx8-isi-crossbar.o imx8-isi-gasket.o \
> > + imx8-isi-hw.o imx8-isi-pipe.o imx8-isi-video.o
> > imx8-isi-$(CONFIG_DEBUG_FS) += imx8-isi-debug.o
> > imx8-isi-$(CONFIG_VIDEO_IMX8_ISI_M2M) += imx8-isi-m2m.o
> >
> > diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> > b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> > index 253e77189b69..f2774325dd61 100644
> > --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> > +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
> > @@ -18,9 +18,6 @@
> > #include <linux/string.h>
> > #include <linux/types.h>
> >
> > -#include <media/media-device.h>
> > -#include <media/v4l2-async.h>
> > -#include <media/v4l2-device.h>
>
> Why do you remove those three headers ? The changes below in this file are
> unrelated. Did you realize the headers are not needed, or is it a change included
> by mistake ?
I remove them since they have been included by "imx8-isi-core.h". Same reason as bellow.
But as you said, they are not related to the bellow changes. I shouldn't include them in this patch.
>
> > #include <media/v4l2-mc.h>
> >
> > #include "imx8-isi-core.h"
> > @@ -289,7 +286,7 @@ static const struct mxc_isi_plat_data
> mxc_imx8mn_data = {
> > .clks = mxc_imx8mn_clks,
> > .num_clks = ARRAY_SIZE(mxc_imx8mn_clks),
> > .buf_active_reverse = false,
> > - .has_gasket = true,
> > + .gasket_ops = &mxc_imx8_gasket_ops,
> > .has_36bit_dma = false,
> > };
> >
> > @@ -303,7 +300,7 @@ static const struct mxc_isi_plat_data
> mxc_imx8mp_data = {
> > .clks = mxc_imx8mn_clks,
> > .num_clks = ARRAY_SIZE(mxc_imx8mn_clks),
> > .buf_active_reverse = true,
> > - .has_gasket = true,
> > + .gasket_ops = &mxc_imx8_gasket_ops,
> > .has_36bit_dma = true,
> > };
> >
> > @@ -443,7 +440,7 @@ static int mxc_isi_probe(struct platform_device
> *pdev)
> > return PTR_ERR(isi->regs);
> > }
> >
> > - if (isi->pdata->has_gasket) {
> > + if (isi->pdata->gasket_ops) {
> > isi->gasket =
> syscon_regmap_lookup_by_phandle(dev->of_node,
> >
> "fsl,blk-ctrl");
> > if (IS_ERR(isi->gasket)) { diff --git
> > a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> > b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> > index e469788a9e6c..87182ebb99f0 100644
> > --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> > +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
> > @@ -10,14 +10,6 @@
> > #ifndef __MXC_ISI_CORE_H__
> > #define __MXC_ISI_CORE_H__
> >
> > -#include <linux/list.h>
> > -#include <linux/mutex.h>
> > -#include <linux/spinlock.h>
> > -#include <linux/types.h>
> > -#include <linux/videodev2.h>
> > -
> > -#include <media/media-device.h>
> > -#include <media/media-entity.h>
>
> Same question here.
>
> > #include <media/v4l2-async.h>
> > #include <media/v4l2-ctrls.h>
> > #include <media/v4l2-dev.h>
> > @@ -147,6 +139,14 @@ struct mxc_isi_set_thd {
> > struct mxc_isi_panic_thd panic_set_thd_v; };
> >
> > +struct mxc_gasket_ops {
> > + void (*enable)(struct mxc_isi_dev *isi,
> > + const struct v4l2_mbus_frame_desc *fd,
> > + const struct v4l2_mbus_framefmt *fmt,
> > + const unsigned int port);
> > + void (*disable)(struct mxc_isi_dev *isi, const unsigned int
> > +port); };
> > +
> > enum model {
> > MXC_ISI_IMX8MN,
> > MXC_ISI_IMX8MP,
> > @@ -159,10 +159,10 @@ struct mxc_isi_plat_data {
> > unsigned int reg_offset;
> > const struct mxc_isi_ier_reg *ier_reg;
> > const struct mxc_isi_set_thd *set_thd;
> > + const struct mxc_gasket_ops *gasket_ops;
> > const struct clk_bulk_data *clks;
> > unsigned int num_clks;
> > bool buf_active_reverse;
> > - bool has_gasket;
> > bool has_36bit_dma;
> > };
> >
> > @@ -286,6 +286,8 @@ struct mxc_isi_dev {
> > struct dentry *debugfs_root;
> > };
> >
> > +extern const struct mxc_gasket_ops mxc_imx8_gasket_ops;
> > +
> > int mxc_isi_crossbar_init(struct mxc_isi_dev *isi); void
> > mxc_isi_crossbar_cleanup(struct mxc_isi_crossbar *xbar); int
> > mxc_isi_crossbar_register(struct mxc_isi_crossbar *xbar); diff --git
> > a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
> > b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
> > index f7447b2f4d77..55637b6ffccf 100644
> > --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
> > +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
> > @@ -8,15 +8,10 @@
> > #include <linux/device.h>
> > #include <linux/errno.h>
> > #include <linux/kernel.h>
> > -#include <linux/minmax.h>
> > -#include <linux/regmap.h>
> > -#include <linux/slab.h>
>
> And here :-)
>
> > #include <linux/string.h>
> > #include <linux/types.h>
> >
> > #include <media/media-entity.h>
> > -#include <media/mipi-csi2.h>
>
> This is right, as the header is included only for MIPI_CSI2_DT_YUV422_8B, which
> is removed below.
>
> > -#include <media/v4l2-subdev.h>
>
> But this doesn't seem right.
>
> >
> > #include "imx8-isi-core.h"
> >
> > @@ -25,32 +20,18 @@ static inline struct mxc_isi_crossbar
> *to_isi_crossbar(struct v4l2_subdev *sd)
> > return container_of(sd, struct mxc_isi_crossbar, sd); }
> >
> > -/*
> > ----------------------------------------------------------------------
> > -------
> > - * Media block control (i.MX8MN and i.MX8MP only)
> > - */
> > -#define GASKET_BASE(n) (0x0060 + (n) *
> 0x30)
> > -
> > -#define GASKET_CTRL 0x0000
> > -#define GASKET_CTRL_DATA_TYPE(dt) ((dt) << 8)
> > -#define GASKET_CTRL_DATA_TYPE_MASK (0x3f << 8)
> > -#define GASKET_CTRL_DUAL_COMP_ENABLE BIT(1)
> > -#define GASKET_CTRL_ENABLE BIT(0)
> > -
> > -#define GASKET_HSIZE 0x0004
> > -#define GASKET_VSIZE 0x0008
> > -
> > static int mxc_isi_crossbar_gasket_enable(struct mxc_isi_crossbar *xbar,
> > struct v4l2_subdev_state
> *state,
> > struct v4l2_subdev
> *remote_sd,
> > u32 remote_pad, unsigned int
> > port) {
> > struct mxc_isi_dev *isi = xbar->isi;
> > + const struct mxc_gasket_ops *gasket_ops =
> > + isi->pdata->gasket_ops;
> > const struct v4l2_mbus_framefmt *fmt;
> > struct v4l2_mbus_frame_desc fd;
> > - u32 val;
> > int ret;
> >
> > - if (!isi->pdata->has_gasket)
> > + if (!gasket_ops)
> > return 0;
> >
> > /*
> > @@ -77,17 +58,7 @@ static int mxc_isi_crossbar_gasket_enable(struct
> mxc_isi_crossbar *xbar,
> > if (!fmt)
> > return -EINVAL;
> >
> > - regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_HSIZE,
> fmt->width);
> > - regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_VSIZE,
> fmt->height);
> > -
> > - val = GASKET_CTRL_DATA_TYPE(fd.entry[0].bus.csi2.dt)
> > - | GASKET_CTRL_ENABLE;
> > -
> > - if (fd.entry[0].bus.csi2.dt == MIPI_CSI2_DT_YUV422_8B)
> > - val |= GASKET_CTRL_DUAL_COMP_ENABLE;
> > -
> > - regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, val);
> > -
> > + gasket_ops->enable(isi, &fd, fmt, port);
> > return 0;
> > }
> >
> > @@ -95,11 +66,12 @@ static void mxc_isi_crossbar_gasket_disable(struct
> mxc_isi_crossbar *xbar,
> > unsigned int port) {
> > struct mxc_isi_dev *isi = xbar->isi;
> > + const struct mxc_gasket_ops *gasket_ops =
> > + isi->pdata->gasket_ops;
> >
> > - if (!isi->pdata->has_gasket)
> > + if (!gasket_ops)
> > return;
> >
> > - regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, 0);
> > + gasket_ops->disable(isi, port);
> > }
> >
> > /* -----------------------------------------------------------------------------
> > diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-gasket.c
> b/drivers/media/platform/nxp/imx8-isi/imx8-isi-gasket.c
> > new file mode 100644
> > index 000000000000..f3758af59db1
> > --- /dev/null
> > +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-gasket.c
> > @@ -0,0 +1,52 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright 2019-2023 NXP
> > + */
>
> A blank line here would be nice, like in the other files.
>
> > +#include <linux/regmap.h>
>
> Here too.
>
> > +#include <media/mipi-csi2.h>
> > +
> > +#include "imx8-isi-core.h"
> > +
>
> Let's use section headers like in the other files, to clearly separate
> the i.MX8 and i.MX9 implementations.
>
> /* -----------------------------------------------------------------------------
> * i.MX8MN and i.MX8MP gasket
> */
>
> > +/* GASKET (i.MX8MN and i.MX8MP only) */
>
> Then you can drop this comment, and the ones before the enable and
> disable functions.
>
> > +#define GASKET_BASE(n) (0x0060 + (n) *
> 0x30)
> > +
> > +#define GASKET_CTRL 0x0000
> > +#define GASKET_CTRL_DATA_TYPE(dt) ((dt) << 8)
> > +#define GASKET_CTRL_DATA_TYPE_MASK (0x3f << 8)
> > +#define GASKET_CTRL_DUAL_COMP_ENABLE BIT(1)
> > +#define GASKET_CTRL_ENABLE BIT(0)
> > +
> > +#define GASKET_HSIZE 0x0004
> > +#define GASKET_VSIZE 0x0008
> > +
> > +/* Configure and enable gasket for i.MX8MN and i.MX8P */
> > +static void mxc_imx8_gasket_enable(struct mxc_isi_dev *isi,
> > + const struct v4l2_mbus_frame_desc
> *fd,
> > + const struct v4l2_mbus_framefmt
> *fmt,
> > + const unsigned int port)
> > +{
> > + u32 val;
> > +
> > + regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_HSIZE,
> fmt->width);
> > + regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_VSIZE,
> fmt->height);
> > +
> > + val = GASKET_CTRL_DATA_TYPE(fd->entry[0].bus.csi2.dt);
> > + if (fd->entry[0].bus.csi2.dt == MIPI_CSI2_DT_YUV422_8B)
> > + val |= GASKET_CTRL_DUAL_COMP_ENABLE;
> > +
> > + val |= GASKET_CTRL_ENABLE;
> > + regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, val);
> > +}
> > +
> > +/* Disable gasket for i.MX8MN and i.MX8P */
> > +static void mxc_imx8_gasket_disable(struct mxc_isi_dev *isi,
> > + const unsigned int port)
> > +{
> > + regmap_write(isi->gasket, GASKET_BASE(port) + GASKET_CTRL, 0);
> > +}
> > +
> > +/* Gasket operations for i.MX8MN and i.MX8MP */
> > +const struct mxc_gasket_ops mxc_imx8_gasket_ops = {
> > + .enable = mxc_imx8_gasket_enable,
> > + .disable = mxc_imx8_gasket_disable,
> > +};
>
> --
> Regards,
>
> Laurent Pinchart
