media: ti-vpe: cal: Refactor interrupt enable/disable

Interrupts are enabled and disabled by the cal_camerarx_enable_irqs()
and cal_camerarx_disable_irqs(). Despite their name, they deal with all
interrupts, not just the CAMERARX interrupts, and they hardcode the
assumption that the context index is identical to the CAMERARX index.

Split the context-related interrupt management to two new functions,
cal_ctx_enable_irqs() and cal_ctx_disable_irqs(), called from the
cal_start_streaming() and cal_stop_streaming() functions. The explicit
calls to cal_camerarx_enable_irqs() and cal_camerarx_disable_irqs() are
folded with the CAMERARX .s_stream() operation to simplify the CAMERARX
API.

Enabling the OCPO error interrupt is moved to the PM runtime resume
operation, as it's global to the device, not related to a CAMERARX or
context. The VC IRQ enable and disable are removed as they're not used,
the parent interrupt bit (CAL_HL_IRQ_VC_MASK) never being set.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/platform/ti-vpe/cal-camerarx.c
index fd37ce209461ab066cf1af8b7b4e3fbc2ad36e6e..ce46046c9ba4de5e48ed58ee984b4f51d40f9f28 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal-camerarx.c
+++ b/drivers/media/platform/ti-vpe/cal-camerarx.c
@@ -233,6 +233,29 @@ static void cal_camerarx_wait_stop_state(struct cal_camerarx *phy)
                phy_err(phy, "Timeout waiting for stop state\n");
 }
 
+static void cal_camerarx_enable_irqs(struct cal_camerarx *phy)
+{
+       const u32 cio_err_mask =
+               CAL_CSI2_COMPLEXIO_IRQ_LANE_ERRORS_MASK |
+               CAL_CSI2_COMPLEXIO_IRQ_FIFO_OVR_MASK |
+               CAL_CSI2_COMPLEXIO_IRQ_SHORT_PACKET_MASK |
+               CAL_CSI2_COMPLEXIO_IRQ_ECC_NO_CORRECTION_MASK;
+
+       /* Enable CIO error IRQs. */
+       cal_write(phy->cal, CAL_HL_IRQENABLE_SET(0),
+                 CAL_HL_IRQ_CIO_MASK(phy->instance));
+       cal_write(phy->cal, CAL_CSI2_COMPLEXIO_IRQENABLE(phy->instance),
+                 cio_err_mask);
+}
+
+static void cal_camerarx_disable_irqs(struct cal_camerarx *phy)
+{
+       /* Disable CIO error irqs */
+       cal_write(phy->cal, CAL_HL_IRQENABLE_CLR(0),
+                 CAL_HL_IRQ_CIO_MASK(phy->instance));
+       cal_write(phy->cal, CAL_CSI2_COMPLEXIO_IRQENABLE(phy->instance), 0);
+}
+
 static int cal_camerarx_start(struct cal_camerarx *phy)
 {
        s64 external_rate;
@@ -250,6 +273,8 @@ static int cal_camerarx_start(struct cal_camerarx *phy)
                return ret;
        }
 
+       cal_camerarx_enable_irqs(phy);
+
        /*
         * CSI-2 PHY Link Initialization Sequence, according to the DRA74xP /
         * DRA75xP / DRA76xP / DRA77xP TRM. The DRA71x / DRA72x and the AM65x /
@@ -339,6 +364,7 @@ static int cal_camerarx_start(struct cal_camerarx *phy)
        ret = v4l2_subdev_call(phy->sensor, video, s_stream, 1);
        if (ret) {
                v4l2_subdev_call(phy->sensor, core, s_power, 0);
+               cal_camerarx_disable_irqs(phy);
                phy_err(phy, "stream on failed in subdev\n");
                return ret;
        }
@@ -366,6 +392,8 @@ static void cal_camerarx_stop(struct cal_camerarx *phy)
        unsigned int i;
        int ret;
 
+       cal_camerarx_disable_irqs(phy);
+
        cal_camerarx_power(phy, false);
 
        /* Assert Complex IO Reset */
@@ -427,61 +455,6 @@ void cal_camerarx_i913_errata(struct cal_camerarx *phy)
        camerarx_write(phy, CAL_CSI2_PHY_REG10, reg10);
 }
 
-/*
- * Enable the expected IRQ sources
- */
-void cal_camerarx_enable_irqs(struct cal_camerarx *phy)
-{
-       u32 val;
-
-       const u32 cio_err_mask =
-               CAL_CSI2_COMPLEXIO_IRQ_LANE_ERRORS_MASK |
-               CAL_CSI2_COMPLEXIO_IRQ_FIFO_OVR_MASK |
-               CAL_CSI2_COMPLEXIO_IRQ_SHORT_PACKET_MASK |
-               CAL_CSI2_COMPLEXIO_IRQ_ECC_NO_CORRECTION_MASK;
-
-       /* Enable CIO error irqs */
-       cal_write(phy->cal, CAL_HL_IRQENABLE_SET(0),
-                 CAL_HL_IRQ_CIO_MASK(phy->instance));
-       cal_write(phy->cal, CAL_CSI2_COMPLEXIO_IRQENABLE(phy->instance),
-                 cio_err_mask);
-
-       /* Always enable OCPO error */
-       cal_write(phy->cal, CAL_HL_IRQENABLE_SET(0), CAL_HL_IRQ_OCPO_ERR_MASK);
-
-       /* Enable IRQ_WDMA_END 0/1 */
-       val = 0;
-       cal_set_field(&val, 1, CAL_HL_IRQ_MASK(phy->instance));
-       cal_write(phy->cal, CAL_HL_IRQENABLE_SET(1), val);
-       /* Enable IRQ_WDMA_START 0/1 */
-       val = 0;
-       cal_set_field(&val, 1, CAL_HL_IRQ_MASK(phy->instance));
-       cal_write(phy->cal, CAL_HL_IRQENABLE_SET(2), val);
-       /* Todo: Add VC_IRQ and CSI2_COMPLEXIO_IRQ handling */
-       cal_write(phy->cal, CAL_CSI2_VC_IRQENABLE(0), 0xFF000000);
-}
-
-void cal_camerarx_disable_irqs(struct cal_camerarx *phy)
-{
-       u32 val;
-
-       /* Disable CIO error irqs */
-       cal_write(phy->cal, CAL_HL_IRQENABLE_CLR(0),
-                 CAL_HL_IRQ_CIO_MASK(phy->instance));
-       cal_write(phy->cal, CAL_CSI2_COMPLEXIO_IRQENABLE(phy->instance), 0);
-
-       /* Disable IRQ_WDMA_END 0/1 */
-       val = 0;
-       cal_set_field(&val, 1, CAL_HL_IRQ_MASK(phy->instance));
-       cal_write(phy->cal, CAL_HL_IRQENABLE_CLR(1), val);
-       /* Disable IRQ_WDMA_START 0/1 */
-       val = 0;
-       cal_set_field(&val, 1, CAL_HL_IRQ_MASK(phy->instance));
-       cal_write(phy->cal, CAL_HL_IRQENABLE_CLR(2), val);
-       /* Todo: Add VC_IRQ and CSI2_COMPLEXIO_IRQ handling */
-       cal_write(phy->cal, CAL_CSI2_VC_IRQENABLE(0), 0);
-}
-
 void cal_camerarx_ppi_enable(struct cal_camerarx *phy)
 {
        cal_write(phy->cal, CAL_CSI2_PPI_CTRL(phy->instance),

diff --git a/drivers/media/platform/ti-vpe/cal-video.c b/drivers/media/platform/ti-vpe/cal-video.c
index e7ad0b93fc59f8e5d71436d28bcdf4ff86612987..3807d91f0392691946cf0d88b83d6d654b249e32 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal-video.c
+++ b/drivers/media/platform/ti-vpe/cal-video.c
@@ -517,8 +517,7 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)
        cal_ctx_csi2_config(ctx);
        cal_ctx_pix_proc_config(ctx);
        cal_ctx_wr_dma_config(ctx);
-
-       cal_camerarx_enable_irqs(ctx->phy);
+       cal_ctx_enable_irqs(ctx);
 
        ret = v4l2_subdev_call(&ctx->phy->subdev, video, s_stream, 1);
        if (ret)
@@ -570,7 +569,8 @@ static void cal_stop_streaming(struct vb2_queue *vq)
        if (dma_act)
                ctx_err(ctx, "failed to disable dma cleanly\n");
 
-       cal_camerarx_disable_irqs(ctx->phy);
+       cal_ctx_disable_irqs(ctx);
+
        v4l2_subdev_call(&ctx->phy->subdev, video, s_stream, 0);
 
        /* Release all active buffers */

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 213381b8ddfa971a3e60e7e1b47ed67758f06696..785ce4171d40b3db7c59d0edc93d1bfec78d02dc 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -411,6 +411,24 @@ void cal_ctx_wr_dma_addr(struct cal_ctx *ctx, unsigned int dmaaddr)
        cal_write(ctx->cal, CAL_WR_DMA_ADDR(ctx->index), dmaaddr);
 }
 
+void cal_ctx_enable_irqs(struct cal_ctx *ctx)
+{
+       /* Enable IRQ_WDMA_END and IRQ_WDMA_START. */
+       cal_write(ctx->cal, CAL_HL_IRQENABLE_SET(1),
+                 CAL_HL_IRQ_MASK(ctx->index));
+       cal_write(ctx->cal, CAL_HL_IRQENABLE_SET(2),
+                 CAL_HL_IRQ_MASK(ctx->index));
+}
+
+void cal_ctx_disable_irqs(struct cal_ctx *ctx)
+{
+       /* Disable IRQ_WDMA_END and IRQ_WDMA_START. */
+       cal_write(ctx->cal, CAL_HL_IRQENABLE_CLR(1),
+                 CAL_HL_IRQ_MASK(ctx->index));
+       cal_write(ctx->cal, CAL_HL_IRQENABLE_CLR(2),
+                 CAL_HL_IRQ_MASK(ctx->index));
+}
+
 /* ------------------------------------------------------------------
  *     IRQ Handling
  * ------------------------------------------------------------------
@@ -1041,6 +1059,12 @@ static int cal_runtime_resume(struct device *dev)
                        cal_camerarx_i913_errata(cal->phy[i]);
        }
 
+       /*
+        * Enable global interrupts that are not related to a particular
+        * CAMERARAX or context.
+        */
+       cal_write(cal, CAL_HL_IRQENABLE_SET(0), CAL_HL_IRQ_OCPO_ERR_MASK);
+
        return 0;
 }
 

diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h
index be82249421205991ae13774aacb7184db865b104..1c6fbee211d25cc22ce29f313b8fbb07fa4b1c6f 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal.h
+++ b/drivers/media/platform/ti-vpe/cal.h
@@ -262,8 +262,6 @@ const struct cal_format_info *cal_format_by_code(u32 code);
 void cal_quickdump_regs(struct cal_dev *cal);
 
 void cal_camerarx_disable(struct cal_camerarx *phy);
-void cal_camerarx_enable_irqs(struct cal_camerarx *phy);
-void cal_camerarx_disable_irqs(struct cal_camerarx *phy);
 void cal_camerarx_ppi_enable(struct cal_camerarx *phy);
 void cal_camerarx_ppi_disable(struct cal_camerarx *phy);
 void cal_camerarx_i913_errata(struct cal_camerarx *phy);
@@ -275,6 +273,8 @@ void cal_ctx_csi2_config(struct cal_ctx *ctx);
 void cal_ctx_pix_proc_config(struct cal_ctx *ctx);
 void cal_ctx_wr_dma_config(struct cal_ctx *ctx);
 void cal_ctx_wr_dma_addr(struct cal_ctx *ctx, unsigned int dmaaddr);
+void cal_ctx_enable_irqs(struct cal_ctx *ctx);
+void cal_ctx_disable_irqs(struct cal_ctx *ctx);
 
 int cal_ctx_v4l2_register(struct cal_ctx *ctx);
 void cal_ctx_v4l2_unregister(struct cal_ctx *ctx);