Re: [PATCH v5 03/10] media: aspeed: add more debug log messages

Jammy Huang
2021-11-19T01:57:55Z

Hi Sakari,

On 2021/11/18 下午 07:57, Sakari Ailus wrote:
> Hi Jammy,
>
> On Thu, Nov 18, 2021 at 03:40:24PM +0800, Jammy Huang wrote:
>> The new messages are listed as below:
>> 1. jpeg header and capture buffer information
>> 2. information for each irq
>> 3. current capture mode, sync or direct-fetch
>> 4. time consumed for each frame
>> 5. input timing changed information
>>
>> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
>> ---
>> v5:
>> - no update
>> v4:
>> - modify log level
>> v3:
>> - update commit message
>> v2:
>> - new
>> ---
>> drivers/media/platform/aspeed-video.c | 24 ++++++++++++++++++++++++
>> 1 file changed, 24 insertions(+)
>>
>> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
>> index 6af57467b6d4..e8dd0a7ebfc7 100644
>> --- a/drivers/media/platform/aspeed-video.c
>> +++ b/drivers/media/platform/aspeed-video.c
>> @@ -461,12 +461,17 @@ static void aspeed_video_write(struct aspeed_video *video, u32 reg, u32 val)
>>
>> static void update_perf(struct aspeed_video_perf *p)
>> {
>> + struct aspeed_video *v = container_of(p, struct aspeed_video,
>> + perf);
>> +
>> p->duration =
>> ktime_to_ms(ktime_sub(ktime_get(), p->last_sample));
>> p->totaltime += p->duration;
>>
>> p->duration_max = max(p->duration, p->duration_max);
>> p->duration_min = min(p->duration, p->duration_min);
>> + v4l2_dbg(2, debug, &v->v4l2_dev, "time consumed: %d ms\n",
>> + p->duration);
>> }
>>
>> static int aspeed_video_start_frame(struct aspeed_video *video)
>> @@ -597,6 +602,12 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg)
>> struct aspeed_video *video = arg;
>> u32 sts = aspeed_video_read(video, VE_INTERRUPT_STATUS);
>>
>> + v4l2_dbg(2, debug, &video->v4l2_dev, "irq sts=%#x %s%s%s%s\n", sts,
>> + sts & VE_INTERRUPT_MODE_DETECT_WD ? ", unlock" : "",
>> + sts & VE_INTERRUPT_MODE_DETECT ? ", lock" : "",
>> + sts & VE_INTERRUPT_CAPTURE_COMPLETE ? ", capture-done" : "",
>> + sts & VE_INTERRUPT_COMP_COMPLETE ? ", comp-done" : "");
>> +
>> /*
>> * Resolution changed or signal was lost; reset the engine and
>> * re-initialize
>> @@ -910,6 +921,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
>>
>> /* Don't use direct mode below 1024 x 768 (irqs don't fire) */
>> if (size < DIRECT_FETCH_THRESHOLD) {
>> + v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Sync Mode\n");
>> aspeed_video_write(video, VE_TGS_0,
>> FIELD_PREP(VE_TGS_FIRST,
>> video->frame_left - 1) |
>> @@ -921,6 +933,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
>> video->frame_bottom + 1));
>> aspeed_video_update(video, VE_CTRL, 0, VE_CTRL_INT_DE);
>> } else {
>> + v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Direct Mode\n");
>> aspeed_video_update(video, VE_CTRL, 0, VE_CTRL_DIRECT_FETCH);
>> }
>>
>> @@ -937,6 +950,10 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
>> if (!aspeed_video_alloc_buf(video, &video->srcs[1], size))
>> goto err_mem;
>>
>> + v4l2_dbg(1, debug, &video->v4l2_dev, "src buf0 addr(%#x) size(%d)\n",
>> + video->srcs[0].dma, video->srcs[0].size);
>> + v4l2_dbg(1, debug, &video->v4l2_dev, "src buf1 addr(%#x) size(%d)\n",
>> + video->srcs[1].dma, video->srcs[1].size);
>> aspeed_video_write(video, VE_SRC0_ADDR, video->srcs[0].dma);
>> aspeed_video_write(video, VE_SRC1_ADDR, video->srcs[1].dma);
>> }
>> @@ -1201,6 +1218,9 @@ static int aspeed_video_set_dv_timings(struct file *file, void *fh,
>>
>> timings->type = V4L2_DV_BT_656_1120;
>>
>> + v4l2_dbg(1, debug, &video->v4l2_dev, "set new timings(%dx%d)\n",
>> + timings->bt.width, timings->bt.height);
>> +
>> return 0;
>> }
>>
>> @@ -1383,6 +1403,7 @@ static void aspeed_video_resolution_work(struct work_struct *work)
>> .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION,
>> };
>>
>> + v4l2_dbg(1, debug, &video->v4l2_dev, "fire source change event\n");
>> v4l2_event_queue(&video->vdev, &ev);
>> } else if (test_bit(VIDEO_STREAMING, &video->flags)) {
>> /* No resolution change so just restart streaming */
>> @@ -1715,6 +1736,7 @@ static int aspeed_video_init(struct aspeed_video *video)
>> dev_err(dev, "Unable to request IRQ %d\n", irq);
>> return rc;
>> }
>> + dev_info(video->dev, "irq %d\n", irq);
>>
>> video->eclk = devm_clk_get(dev, "eclk");
>> if (IS_ERR(video->eclk)) {
>> @@ -1751,6 +1773,8 @@ static int aspeed_video_init(struct aspeed_video *video)
>> rc = -ENOMEM;
>> goto err_release_reserved_mem;
>> }
>> + dev_info(video->dev, "alloc mem size(%d) at %#x for jpeg header\n",
>> + VE_JPEG_HEADER_SIZE, video->jpeg.dma);
>>
>> aspeed_video_init_jpeg_table(video->jpeg.virt, video->yuv420);
>>
> You're using both v4l2_*() and dev_*() functions for printing messages.
> They come with different prefixes, and it'd be better to stick with either,
> not both.
Sure, I agree with you. Why I still have dev_*() here is v4l2_dev isn't
ready yet before
v4l2_device_register(). I think it could better to keep dev_*() in dev's
probe().

--
Best Regards
Jammy