Hi Alexander,
On Fri, Jan 06, 2023 at 03:50:37PM +0100, Alexander Stein wrote:
> Am Freitag, 6. Januar 2023, 14:32:26 CET schrieb Laurent Pinchart:
> > Add pxp_read() and pxp_write() functions to wrap readl() and writel()
> > respectively. This can be useful for debugging register accesses.
>
> I know this is just sending old patches, but how about using regmap-mmio
> instead? This gives you access in debugfs for register values.
I'm fine with that. Notice how easy it would be on top of this patch, as
you will then only need to modify pxp_read() and pxp_write() ;-)
My i.MX7D board is now at the bottom of a box so I don't plan to work on
this myself, but I would review a patch.
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> > ---
> > drivers/media/platform/nxp/imx-pxp.c | 118 +++++++++++++++------------
> > 1 file changed, 64 insertions(+), 54 deletions(-)
> >
> > diff --git a/drivers/media/platform/nxp/imx-pxp.c
> > b/drivers/media/platform/nxp/imx-pxp.c index 68f838e3069d..e4d7a6339929
> > 100644
> > --- a/drivers/media/platform/nxp/imx-pxp.c
> > +++ b/drivers/media/platform/nxp/imx-pxp.c
> > @@ -253,6 +253,16 @@ static struct pxp_q_data *get_q_data(struct pxp_ctx
> > *ctx, return &ctx->q_data[V4L2_M2M_DST];
> > }
> >
> > +static inline u32 pxp_read(struct pxp_dev *dev, u32 reg)
> > +{
> > + return readl(dev->mmio + reg);
> > +}
> > +
> > +static inline void pxp_write(struct pxp_dev *dev, u32 reg, u32 value)
> > +{
> > + writel(value, dev->mmio + reg);
> > +}
> > +
> > static u32 pxp_v4l2_pix_fmt_to_ps_format(u32 v4l2_pix_fmt)
> > {
> > switch (v4l2_pix_fmt) {
> > @@ -505,11 +515,11 @@ static void pxp_setup_csc(struct pxp_ctx *ctx)
> > csc1_coef = csc1_coef_smpte240m_lim;
> > }
> >
> > - writel(csc1_coef[0], dev->mmio + HW_PXP_CSC1_COEF0);
> > - writel(csc1_coef[1], dev->mmio + HW_PXP_CSC1_COEF1);
> > - writel(csc1_coef[2], dev->mmio + HW_PXP_CSC1_COEF2);
> > + pxp_write(dev, HW_PXP_CSC1_COEF0, csc1_coef[0]);
> > + pxp_write(dev, HW_PXP_CSC1_COEF1, csc1_coef[1]);
> > + pxp_write(dev, HW_PXP_CSC1_COEF2, csc1_coef[2]);
> > } else {
> > - writel(BM_PXP_CSC1_COEF0_BYPASS, dev->mmio +
> HW_PXP_CSC1_COEF0);
> > + pxp_write(dev, HW_PXP_CSC1_COEF0,
> BM_PXP_CSC1_COEF0_BYPASS);
> > }
> >
> > if (!pxp_v4l2_pix_fmt_is_yuv(ctx->q_data[V4L2_M2M_SRC].fmt->fourcc)
> &&
> > @@ -725,15 +735,15 @@ static void pxp_setup_csc(struct pxp_ctx *ctx)
> > BP_PXP_CSC2_CTRL_CSC_MODE;
> > }
> >
> > - writel(csc2_ctrl, dev->mmio + HW_PXP_CSC2_CTRL);
> > - writel(csc2_coef[0], dev->mmio + HW_PXP_CSC2_COEF0);
> > - writel(csc2_coef[1], dev->mmio + HW_PXP_CSC2_COEF1);
> > - writel(csc2_coef[2], dev->mmio + HW_PXP_CSC2_COEF2);
> > - writel(csc2_coef[3], dev->mmio + HW_PXP_CSC2_COEF3);
> > - writel(csc2_coef[4], dev->mmio + HW_PXP_CSC2_COEF4);
> > - writel(csc2_coef[5], dev->mmio + HW_PXP_CSC2_COEF5);
> > + pxp_write(dev, HW_PXP_CSC2_CTRL, csc2_ctrl);
> > + pxp_write(dev, HW_PXP_CSC2_COEF0, csc2_coef[0]);
> > + pxp_write(dev, HW_PXP_CSC2_COEF1, csc2_coef[1]);
> > + pxp_write(dev, HW_PXP_CSC2_COEF2, csc2_coef[2]);
> > + pxp_write(dev, HW_PXP_CSC2_COEF3, csc2_coef[3]);
> > + pxp_write(dev, HW_PXP_CSC2_COEF4, csc2_coef[4]);
> > + pxp_write(dev, HW_PXP_CSC2_COEF5, csc2_coef[5]);
> > } else {
> > - writel(BM_PXP_CSC2_CTRL_BYPASS, dev->mmio +
> HW_PXP_CSC2_CTRL);
> > + pxp_write(dev, HW_PXP_CSC2_CTRL, BM_PXP_CSC2_CTRL_BYPASS);
> > }
> > }
> >
> > @@ -820,8 +830,8 @@ static void pxp_set_data_path(struct pxp_ctx *ctx)
> > ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX17_SEL(3);
> > ctrl1 |= BF_PXP_DATA_PATH_CTRL1_MUX16_SEL(3);
> >
> > - writel(ctrl0, dev->mmio + HW_PXP_DATA_PATH_CTRL0);
> > - writel(ctrl1, dev->mmio + HW_PXP_DATA_PATH_CTRL1);
> > + pxp_write(dev, HW_PXP_DATA_PATH_CTRL0, ctrl0);
> > + pxp_write(dev, HW_PXP_DATA_PATH_CTRL1, ctrl1);
> > }
> >
> > static int pxp_start(struct pxp_ctx *ctx, struct vb2_v4l2_buffer *in_vb,
> > @@ -977,48 +987,48 @@ static int pxp_start(struct pxp_ctx *ctx, struct
> > vb2_v4l2_buffer *in_vb, BF_PXP_PS_SCALE_XSCALE(xscale);
> > ps_offset = BF_PXP_PS_OFFSET_YOFFSET(0) |
> BF_PXP_PS_OFFSET_XOFFSET(0);
> >
> > - writel(ctrl, dev->mmio + HW_PXP_CTRL);
> > + pxp_write(dev, HW_PXP_CTRL, ctrl);
> > /* skip STAT */
> > - writel(out_ctrl, dev->mmio + HW_PXP_OUT_CTRL);
> > - writel(out_buf, dev->mmio + HW_PXP_OUT_BUF);
> > - writel(out_buf2, dev->mmio + HW_PXP_OUT_BUF2);
> > - writel(out_pitch, dev->mmio + HW_PXP_OUT_PITCH);
> > - writel(out_lrc, dev->mmio + HW_PXP_OUT_LRC);
> > - writel(out_ps_ulc, dev->mmio + HW_PXP_OUT_PS_ULC);
> > - writel(out_ps_lrc, dev->mmio + HW_PXP_OUT_PS_LRC);
> > - writel(as_ulc, dev->mmio + HW_PXP_OUT_AS_ULC);
> > - writel(as_lrc, dev->mmio + HW_PXP_OUT_AS_LRC);
> > - writel(ps_ctrl, dev->mmio + HW_PXP_PS_CTRL);
> > - writel(ps_buf, dev->mmio + HW_PXP_PS_BUF);
> > - writel(ps_ubuf, dev->mmio + HW_PXP_PS_UBUF);
> > - writel(ps_vbuf, dev->mmio + HW_PXP_PS_VBUF);
> > - writel(ps_pitch, dev->mmio + HW_PXP_PS_PITCH);
> > - writel(0x00ffffff, dev->mmio + HW_PXP_PS_BACKGROUND_0);
> > - writel(ps_scale, dev->mmio + HW_PXP_PS_SCALE);
> > - writel(ps_offset, dev->mmio + HW_PXP_PS_OFFSET);
> > + pxp_write(dev, HW_PXP_OUT_CTRL, out_ctrl);
> > + pxp_write(dev, HW_PXP_OUT_BUF, out_buf);
> > + pxp_write(dev, HW_PXP_OUT_BUF2, out_buf2);
> > + pxp_write(dev, HW_PXP_OUT_PITCH, out_pitch);
> > + pxp_write(dev, HW_PXP_OUT_LRC, out_lrc);
> > + pxp_write(dev, HW_PXP_OUT_PS_ULC, out_ps_ulc);
> > + pxp_write(dev, HW_PXP_OUT_PS_LRC, out_ps_lrc);
> > + pxp_write(dev, HW_PXP_OUT_AS_ULC, as_ulc);
> > + pxp_write(dev, HW_PXP_OUT_AS_LRC, as_lrc);
> > + pxp_write(dev, HW_PXP_PS_CTRL, ps_ctrl);
> > + pxp_write(dev, HW_PXP_PS_BUF, ps_buf);
> > + pxp_write(dev, HW_PXP_PS_UBUF, ps_ubuf);
> > + pxp_write(dev, HW_PXP_PS_VBUF, ps_vbuf);
> > + pxp_write(dev, HW_PXP_PS_PITCH, ps_pitch);
> > + pxp_write(dev, HW_PXP_PS_BACKGROUND_0, 0x00ffffff);
> > + pxp_write(dev, HW_PXP_PS_SCALE, ps_scale);
> > + pxp_write(dev, HW_PXP_PS_OFFSET, ps_offset);
> > /* disable processed surface color keying */
> > - writel(0x00ffffff, dev->mmio + HW_PXP_PS_CLRKEYLOW_0);
> > - writel(0x00000000, dev->mmio + HW_PXP_PS_CLRKEYHIGH_0);
> > + pxp_write(dev, HW_PXP_PS_CLRKEYLOW_0, 0x00ffffff);
> > + pxp_write(dev, HW_PXP_PS_CLRKEYHIGH_0, 0x00000000);
> >
> > /* disable alpha surface color keying */
> > - writel(0x00ffffff, dev->mmio + HW_PXP_AS_CLRKEYLOW_0);
> > - writel(0x00000000, dev->mmio + HW_PXP_AS_CLRKEYHIGH_0);
> > + pxp_write(dev, HW_PXP_AS_CLRKEYLOW_0, 0x00ffffff);
> > + pxp_write(dev, HW_PXP_AS_CLRKEYHIGH_0, 0x00000000);
> >
> > /* setup CSC */
> > pxp_setup_csc(ctx);
> >
> > /* bypass LUT */
> > - writel(BM_PXP_LUT_CTRL_BYPASS, dev->mmio + HW_PXP_LUT_CTRL);
> > + pxp_write(dev, HW_PXP_LUT_CTRL, BM_PXP_LUT_CTRL_BYPASS);
> >
> > pxp_set_data_path(ctx);
> >
> > - writel(0xffff, dev->mmio + HW_PXP_IRQ_MASK);
> > + pxp_write(dev, HW_PXP_IRQ_MASK, 0xffff);
> >
> > /* ungate, enable PS/AS/OUT and PXP operation */
> > - writel(BM_PXP_CTRL_IRQ_ENABLE, dev->mmio + HW_PXP_CTRL_SET);
> > - writel(BM_PXP_CTRL_ENABLE | BM_PXP_CTRL_ENABLE_CSC2 |
> > - BM_PXP_CTRL_ENABLE_ROTATE0 |
> > - BM_PXP_CTRL_ENABLE_PS_AS_OUT, dev->mmio + HW_PXP_CTRL_SET);
> > + pxp_write(dev, HW_PXP_CTRL_SET, BM_PXP_CTRL_IRQ_ENABLE);
> > + pxp_write(dev, HW_PXP_CTRL_SET,
> > + BM_PXP_CTRL_ENABLE | BM_PXP_CTRL_ENABLE_CSC2 |
> > + BM_PXP_CTRL_ENABLE_ROTATE0 |
> BM_PXP_CTRL_ENABLE_PS_AS_OUT);
> >
> > return 0;
> > }
> > @@ -1091,23 +1101,23 @@ static irqreturn_t pxp_irq_handler(int irq, void
> > *dev_id) struct pxp_dev *dev = dev_id;
> > u32 stat;
> >
> > - stat = readl(dev->mmio + HW_PXP_STAT);
> > + stat = pxp_read(dev, HW_PXP_STAT);
> >
> > if (stat & BM_PXP_STAT_IRQ0) {
> > /* we expect x = 0, y = height, irq0 = 1 */
> > if (stat & ~(BM_PXP_STAT_BLOCKX | BM_PXP_STAT_BLOCKY |
> > BM_PXP_STAT_IRQ0))
> > dprintk(dev, "%s: stat = 0x%08x\n", __func__,
> stat);
> > - writel(BM_PXP_STAT_IRQ0, dev->mmio + HW_PXP_STAT_CLR);
> > + pxp_write(dev, HW_PXP_STAT_CLR, BM_PXP_STAT_IRQ0);
> >
> > pxp_job_finish(dev);
> > } else {
> > - u32 irq = readl(dev->mmio + HW_PXP_IRQ);
> > + u32 irq = pxp_read(dev, HW_PXP_IRQ);
> >
> > dprintk(dev, "%s: stat = 0x%08x\n", __func__, stat);
> > dprintk(dev, "%s: irq = 0x%08x\n", __func__, irq);
> >
> > - writel(irq, dev->mmio + HW_PXP_IRQ_CLR);
> > + pxp_write(dev, HW_PXP_IRQ_CLR, irq);
> > }
> >
> > return IRQ_HANDLED;
> > @@ -1753,25 +1763,25 @@ static int pxp_soft_reset(struct pxp_dev *dev)
> > int ret;
> > u32 val;
> >
> > - writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR);
> > - writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR);
> > + pxp_write(dev, HW_PXP_CTRL_CLR, BM_PXP_CTRL_SFTRST);
> > + pxp_write(dev, HW_PXP_CTRL_CLR, BM_PXP_CTRL_CLKGATE);
> >
> > - writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_SET);
> > + pxp_write(dev, HW_PXP_CTRL_SET, BM_PXP_CTRL_SFTRST);
> >
> > ret = readl_poll_timeout(dev->mmio + HW_PXP_CTRL, val,
> > val & BM_PXP_CTRL_CLKGATE, 0, 100);
> > if (ret < 0)
> > return ret;
> >
> > - writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR);
> > - writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR);
> > + pxp_write(dev, HW_PXP_CTRL_CLR, BM_PXP_CTRL_SFTRST);
> > + pxp_write(dev, HW_PXP_CTRL_CLR, BM_PXP_CTRL_CLKGATE);
> >
> > return 0;
> > }
> >
> > static u32 pxp_read_version(struct pxp_dev *dev)
> > {
> > - return readl(dev->mmio + HW_PXP_VERSION);
> > + return pxp_read(dev, HW_PXP_VERSION);
> > }
> >
> > static int pxp_probe(struct platform_device *pdev)
> > @@ -1902,8 +1912,8 @@ static int pxp_remove(struct platform_device *pdev)
> > {
> > struct pxp_dev *dev = platform_get_drvdata(pdev);
> >
> > - writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_SET);
> > - writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_SET);
> > + pxp_write(dev, HW_PXP_CTRL_SET, BM_PXP_CTRL_CLKGATE);
> > + pxp_write(dev, HW_PXP_CTRL_SET, BM_PXP_CTRL_SFTRST);
> >
> > clk_disable_unprepare(dev->clk);
--
Regards,
Laurent Pinchart
