media: platform: amd: isp4 debug fs logging and more descriptive errors

Add debug fs for isp4 driver and add more detailed descriptive error info
to some of the log message

Co-developed-by: Sultan Alsawaf <sultan@kerneltoast.com>
Signed-off-by: Sultan Alsawaf <sultan@kerneltoast.com>
Co-developed-by: Svetoslav Stoilov <Svetoslav.Stoilov@amd.com>
Signed-off-by: Svetoslav Stoilov <Svetoslav.Stoilov@amd.com>
Signed-off-by: Bin Du <Bin.Du@amd.com>
Reviewed-by: Sultan Alsawaf <sultan@kerneltoast.com>
Tested-by: Alexey Zagorodnikov <xglooom@gmail.com>
Tested-by: Kate Hsuan <hpa@redhat.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
Bin Du 2026-05-06 17:32:48 +08:00 committed by Sakari Ailus
parent 2ccf48af22
commit ec4bec227b
8 changed files with 360 additions and 20 deletions

View File

@ -1164,6 +1164,8 @@ F: drivers/media/platform/amd/isp4/Kconfig
F: drivers/media/platform/amd/isp4/Makefile
F: drivers/media/platform/amd/isp4/isp4.c
F: drivers/media/platform/amd/isp4/isp4.h
F: drivers/media/platform/amd/isp4/isp4_debug.c
F: drivers/media/platform/amd/isp4/isp4_debug.h
F: drivers/media/platform/amd/isp4/isp4_fw_cmd_resp.h
F: drivers/media/platform/amd/isp4/isp4_hw_reg.h
F: drivers/media/platform/amd/isp4/isp4_interface.c

View File

@ -4,6 +4,7 @@
obj-$(CONFIG_VIDEO_AMD_ISP4_CAPTURE) += amd_isp4_capture.o
amd_isp4_capture-objs := isp4.o \
isp4_debug.o \
isp4_interface.o \
isp4_subdev.o \
isp4_video.o
isp4_video.o

View File

@ -9,6 +9,7 @@
#include <media/v4l2-ioctl.h>
#include "isp4.h"
#include "isp4_debug.h"
#include "isp4_hw_reg.h"
#define ISP4_DRV_NAME "amd_isp_capture"
@ -191,6 +192,7 @@ static int isp4_capture_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, isp_dev);
isp_debugfs_create(isp_dev);
return 0;
@ -210,6 +212,8 @@ static void isp4_capture_remove(struct platform_device *pdev)
struct isp4_device *isp_dev = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev;
isp_debugfs_remove(isp_dev);
media_device_unregister(&isp_dev->mdev);
isp4sd_deinit(&isp_dev->isp_subdev);
pm_runtime_disable(dev);

View File

@ -0,0 +1,271 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2025 Advanced Micro Devices, Inc.
*/
#include "isp4.h"
#include "isp4_debug.h"
#include "isp4_hw_reg.h"
#include "isp4_interface.h"
#define ISP4DBG_FW_LOG_RINGBUF_SIZE (2 * 1024 * 1024)
#define ISP4DBG_MACRO_2_STR(X) #X
#define ISP4DBG_ONE_TIME_LOG_LEN 510
#ifdef CONFIG_DEBUG_FS
void isp_debugfs_create(struct isp4_device *isp_dev)
{
isp_dev->isp_subdev.debugfs_dir = debugfs_create_dir("amd_isp4", NULL);
debugfs_create_bool("fw_log_enable", 0644,
isp_dev->isp_subdev.debugfs_dir,
&isp_dev->isp_subdev.enable_fw_log);
isp_dev->isp_subdev.fw_log_output =
devm_kzalloc(isp_dev->isp_subdev.dev,
ISP4DBG_FW_LOG_RINGBUF_SIZE + 32,
GFP_KERNEL);
}
void isp_debugfs_remove(struct isp4_device *isp_dev)
{
debugfs_remove_recursive(isp_dev->isp_subdev.debugfs_dir);
isp_dev->isp_subdev.debugfs_dir = NULL;
}
static u32 isp_fw_fill_rb_log(struct isp4_subdev *isp, void *sys, u32 rb_size)
{
struct isp4_interface *ispif = &isp->ispif;
char *buf = isp->fw_log_output;
struct device *dev = isp->dev;
u32 rd_ptr, wr_ptr;
u32 total_cnt = 0;
u32 offset = 0;
u32 cnt;
if (!sys || !rb_size)
return 0;
guard(mutex)(&ispif->isp4if_mutex);
rd_ptr = isp4hw_rreg(isp->mmio, ISP_LOG_RB_RPTR0);
wr_ptr = isp4hw_rreg(isp->mmio, ISP_LOG_RB_WPTR0);
do {
if (wr_ptr > rd_ptr)
cnt = wr_ptr - rd_ptr;
else if (wr_ptr < rd_ptr)
cnt = rb_size - rd_ptr;
else
goto quit;
if (cnt > rb_size) {
dev_err(dev, "fail bad fw log size %u\n", cnt);
goto quit;
}
memcpy(buf + offset, sys + rd_ptr, cnt);
offset += cnt;
total_cnt += cnt;
rd_ptr = (rd_ptr + cnt) % rb_size;
} while (rd_ptr < wr_ptr);
isp4hw_wreg(isp->mmio, ISP_LOG_RB_RPTR0, rd_ptr);
quit:
return total_cnt;
}
void isp_fw_log_print(struct isp4_subdev *isp)
{
struct isp4_interface *ispif = &isp->ispif;
char *fw_log_buf = isp->fw_log_output;
u32 cnt;
if (!isp->enable_fw_log || !fw_log_buf)
return;
cnt = isp_fw_fill_rb_log(isp, ispif->fw_log_buf->sys_addr,
ispif->fw_log_buf->mem_size);
if (cnt) {
char temp_ch;
char *str;
char *end;
/* line end */
char *le;
str = (char *)fw_log_buf;
end = ((char *)fw_log_buf + cnt);
fw_log_buf[cnt] = 0;
while (str < end) {
le = strchr(str, 0x0A);
if ((le && str + ISP4DBG_ONE_TIME_LOG_LEN >= le) ||
(!le && str + ISP4DBG_ONE_TIME_LOG_LEN >= end)) {
if (le)
*le = 0;
if (*str != '\0')
dev_dbg(isp->dev, "%s", str);
if (le) {
*le = 0x0A;
str = le + 1;
} else {
break;
}
} else {
u32 tmp_len = ISP4DBG_ONE_TIME_LOG_LEN;
temp_ch = str[tmp_len];
str[tmp_len] = 0;
dev_dbg(isp->dev, "%s", str);
str[tmp_len] = temp_ch;
str = &str[tmp_len];
}
}
}
}
#endif
char *isp4dbg_get_buf_src_str(u32 src)
{
switch (src) {
case ISP4FW_BUFFER_SOURCE_STREAM:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_SOURCE_STREAM);
default:
return "Unknown buf source";
}
}
char *isp4dbg_get_buf_done_str(u32 status)
{
switch (status) {
case ISP4FW_BUFFER_STATUS_INVALID:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_STATUS_INVALID);
case ISP4FW_BUFFER_STATUS_SKIPPED:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_STATUS_SKIPPED);
case ISP4FW_BUFFER_STATUS_EXIST:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_STATUS_EXIST);
case ISP4FW_BUFFER_STATUS_DONE:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_STATUS_DONE);
case ISP4FW_BUFFER_STATUS_LACK:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_STATUS_LACK);
case ISP4FW_BUFFER_STATUS_DIRTY:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_STATUS_DIRTY);
case ISP4FW_BUFFER_STATUS_MAX:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_STATUS_MAX);
default:
return "Unknown Buf Done Status";
}
}
char *isp4dbg_get_img_fmt_str(int fmt /* enum isp4fw_image_format * */)
{
switch (fmt) {
case ISP4FW_IMAGE_FORMAT_NV12:
return "NV12";
case ISP4FW_IMAGE_FORMAT_YUV422INTERLEAVED:
return "YUV422INTERLEAVED";
default:
return "unknown fmt";
}
}
void isp4dbg_show_bufmeta_info(struct device *dev, char *pre,
void *in, void *orig_buf)
{
struct isp4fw_buffer_meta_info *p;
struct isp4if_img_buf_info *orig;
if (!in)
return;
if (!pre)
pre = "";
p = in;
orig = orig_buf;
dev_dbg(dev, "%s(%s) en:%d,stat:%s(%u),src:%s\n", pre,
isp4dbg_get_img_fmt_str(p->image_prop.image_format),
p->enabled, isp4dbg_get_buf_done_str(p->status), p->status,
isp4dbg_get_buf_src_str(p->source));
dev_dbg(dev, "%p,0x%llx(%u) %p,0x%llx(%u) %p,0x%llx(%u)\n",
orig->planes[0].sys_addr, orig->planes[0].mc_addr,
orig->planes[0].len, orig->planes[1].sys_addr,
orig->planes[1].mc_addr, orig->planes[1].len,
orig->planes[2].sys_addr, orig->planes[2].mc_addr,
orig->planes[2].len);
}
char *isp4dbg_get_buf_type(u32 type)
{
/* enum isp4fw_buffer_type */
switch (type) {
case ISP4FW_BUFFER_TYPE_PREVIEW:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_TYPE_PREVIEW);
case ISP4FW_BUFFER_TYPE_META_INFO:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_TYPE_META_INFO);
case ISP4FW_BUFFER_TYPE_MEM_POOL:
return ISP4DBG_MACRO_2_STR(ISP4FW_BUFFER_TYPE_MEM_POOL);
default:
return "unknown type";
}
}
char *isp4dbg_get_cmd_str(u32 cmd)
{
switch (cmd) {
case ISP4FW_CMD_ID_START_STREAM:
return ISP4DBG_MACRO_2_STR(ISP4FW_CMD_ID_START_STREAM);
case ISP4FW_CMD_ID_STOP_STREAM:
return ISP4DBG_MACRO_2_STR(ISP4FW_CMD_ID_STOP_STREAM);
case ISP4FW_CMD_ID_SEND_BUFFER:
return ISP4DBG_MACRO_2_STR(ISP4FW_CMD_ID_SEND_BUFFER);
case ISP4FW_CMD_ID_SET_STREAM_CONFIG:
return ISP4DBG_MACRO_2_STR(ISP4FW_CMD_ID_SET_STREAM_CONFIG);
case ISP4FW_CMD_ID_SET_OUT_CHAN_PROP:
return ISP4DBG_MACRO_2_STR(ISP4FW_CMD_ID_SET_OUT_CHAN_PROP);
case ISP4FW_CMD_ID_ENABLE_OUT_CHAN:
return ISP4DBG_MACRO_2_STR(ISP4FW_CMD_ID_ENABLE_OUT_CHAN);
default:
return "unknown cmd";
}
}
char *isp4dbg_get_resp_str(u32 cmd)
{
switch (cmd) {
case ISP4FW_RESP_ID_CMD_DONE:
return ISP4DBG_MACRO_2_STR(ISP4FW_RESP_ID_CMD_DONE);
case ISP4FW_RESP_ID_NOTI_FRAME_DONE:
return ISP4DBG_MACRO_2_STR(ISP4FW_RESP_ID_NOTI_FRAME_DONE);
default:
return "unknown respid";
}
}
char *isp4dbg_get_if_stream_str(u32 stream /* enum fw_cmd_resp_stream_id */)
{
switch (stream) {
case ISP4IF_STREAM_ID_GLOBAL:
return "STREAM_GLOBAL";
case ISP4IF_STREAM_ID_1:
return "STREAM1";
default:
return "unknown streamID";
}
}
char *isp4dbg_get_out_ch_str(int ch /* enum isp4fw_pipe_out_ch */)
{
switch ((enum isp4fw_pipe_out_ch)ch) {
case ISP4FW_ISP_PIPE_OUT_CH_PREVIEW:
return "prev";
default:
return "unknown channel";
}
}

View File

@ -0,0 +1,41 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2025 Advanced Micro Devices, Inc.
*/
#ifndef _ISP4_DEBUG_H_
#define _ISP4_DEBUG_H_
#include <linux/dev_printk.h>
#include <linux/printk.h>
#include "isp4_subdev.h"
#ifdef CONFIG_DEBUG_FS
struct isp4_device;
void isp_debugfs_create(struct isp4_device *isp_dev);
void isp_debugfs_remove(struct isp4_device *isp_dev);
void isp_fw_log_print(struct isp4_subdev *isp);
#else
/* to avoid checkpatch warning */
#define isp_debugfs_create(cam) ((void)(cam))
#define isp_debugfs_remove(cam) ((void)(cam))
#define isp_fw_log_print(isp) ((void)(isp))
#endif /* CONFIG_DEBUG_FS */
void isp4dbg_show_bufmeta_info(struct device *dev, char *pre, void *p,
void *orig_buf /* struct sys_img_buf_handle */);
char *isp4dbg_get_img_fmt_str(int fmt /* enum _image_format_t */);
char *isp4dbg_get_out_ch_str(int ch /* enum _isp_pipe_out_ch_t */);
char *isp4dbg_get_cmd_str(u32 cmd);
char *isp4dbg_get_buf_type(u32 type);/* enum _buffer_type_t */
char *isp4dbg_get_resp_str(u32 resp);
char *isp4dbg_get_buf_src_str(u32 src);
char *isp4dbg_get_buf_done_str(u32 status);
char *isp4dbg_get_if_stream_str(u32 stream);
#endif /* _ISP4_DEBUG_H_ */

View File

@ -5,6 +5,7 @@
#include <linux/iopoll.h>
#include "isp4_debug.h"
#include "isp4_fw_cmd_resp.h"
#include "isp4_hw_reg.h"
#include "isp4_interface.h"
@ -302,8 +303,9 @@ static int isp4if_insert_isp_fw_cmd(struct isp4_interface *ispif,
wr_ptr = isp4hw_rreg(ispif->mmio, wreg);
if (rd_ptr >= len || wr_ptr >= len) {
dev_err(dev,
"rb invalid: stream=%u, rd=%u, wr=%u, len=%u, cmd_sz=%u\n",
stream, rd_ptr, wr_ptr, len, cmd_sz);
"rb invalid: stream=%u(%s), rd=%u, wr=%u, len=%u, cmd_sz=%u\n",
stream, isp4dbg_get_if_stream_str(stream), rd_ptr,
wr_ptr, len, cmd_sz);
return -EINVAL;
}
@ -394,8 +396,9 @@ static int isp4if_send_fw_cmd(struct isp4_interface *ispif, u32 cmd_id,
rb_config->reg_wptr);
dev_err(dev,
"fail to get free cmdq slot, stream (%d),rd %u, wr %u\n",
stream, rd_ptr, wr_ptr);
"failed to get free cmdq slot, stream %s(%d),rd %u, wr %u\n",
isp4dbg_get_if_stream_str(stream), stream,
rd_ptr, wr_ptr);
ret = -ETIMEDOUT;
goto free_ele;
}
@ -421,8 +424,8 @@ static int isp4if_send_fw_cmd(struct isp4_interface *ispif, u32 cmd_id,
ret = isp4if_insert_isp_fw_cmd(ispif, stream, &cmd);
if (ret) {
dev_err(dev,
"fail for insert_isp_fw_cmd cmd_id (0x%08x)\n",
cmd_id);
"fail for insert_isp_fw_cmd cmd_id %s(0x%08x)\n",
isp4dbg_get_cmd_str(cmd_id), cmd_id);
goto err_dequeue_ele;
}
}
@ -692,8 +695,9 @@ int isp4if_f2h_resp(struct isp4_interface *ispif, enum isp4if_stream_id stream,
if (checksum != resp->resp_check_sum) {
dev_err(dev, "resp checksum 0x%x,should 0x%x,rptr %u,wptr %u\n",
checksum, resp->resp_check_sum, rd_ptr, wr_ptr);
dev_err(dev, "(%u), seqNo %u, resp_id (0x%x)\n",
stream, resp->resp_seq_num,
dev_err(dev, "%s(%u), seqNo %u, resp_id %s(0x%x)\n",
isp4dbg_get_if_stream_str(stream), stream,
resp->resp_seq_num, isp4dbg_get_resp_str(resp->resp_id),
resp->resp_id);
return -EINVAL;
}
@ -702,8 +706,9 @@ int isp4if_f2h_resp(struct isp4_interface *ispif, enum isp4if_stream_id stream,
err_rb_invalid:
dev_err(dev,
"rb invalid: stream=%u, rd=%u, wr=%u, len=%u, resp_sz=%u\n",
stream, rd_ptr, wr_ptr, len, resp_sz);
"rb invalid: stream=%u(%s), rd=%u, wr=%u, len=%u, resp_sz=%u\n",
stream, isp4dbg_get_if_stream_str(stream), rd_ptr, wr_ptr, len,
resp_sz);
return -EINVAL;
}

View File

@ -7,6 +7,7 @@
#include <linux/units.h>
#include "isp4.h"
#include "isp4_debug.h"
#include "isp4_fw_cmd_resp.h"
#include "isp4_interface.h"
@ -263,9 +264,9 @@ static int isp4sd_setup_output(struct isp4_subdev *isp_subdev,
return -EINVAL;
}
dev_dbg(dev, "channel:%d,fmt %d,w:h=%u:%u,lp:%u,cp%u\n",
cmd_ch_prop.ch,
cmd_ch_prop.image_prop.image_format,
dev_dbg(dev, "channel:%s,fmt %s,w:h=%u:%u,lp:%u,cp%u\n",
isp4dbg_get_out_ch_str(cmd_ch_prop.ch),
isp4dbg_get_img_fmt_str(cmd_ch_prop.image_prop.image_format),
cmd_ch_prop.image_prop.width, cmd_ch_prop.image_prop.height,
cmd_ch_prop.image_prop.luma_pitch,
cmd_ch_prop.image_prop.chroma_pitch);
@ -294,7 +295,8 @@ static int isp4sd_setup_output(struct isp4_subdev *isp_subdev,
return ret;
}
dev_dbg(dev, "enable channel %d\n", cmd_ch_en.ch);
dev_dbg(dev, "enable channel %s\n",
isp4dbg_get_out_ch_str(cmd_ch_en.ch));
if (!sensor_info->start_stream_cmd_sent) {
ret = isp4sd_kickoff_stream(isp_subdev,
@ -381,8 +383,9 @@ static void isp4sd_fw_resp_cmd_done(struct isp4_subdev *isp_subdev,
isp4if_rm_cmd_from_cmdq(ispif, para->cmd_seq_num, para->cmd_id);
struct device *dev = isp_subdev->dev;
dev_dbg(dev, "stream %d,cmd (0x%08x)(%d),seq %u, ele %p\n",
dev_dbg(dev, "stream %d,cmd %s(0x%08x)(%d),seq %u, ele %p\n",
stream_id,
isp4dbg_get_cmd_str(para->cmd_id),
para->cmd_id, para->cmd_status, para->cmd_seq_num,
ele);
@ -458,8 +461,9 @@ static void isp4sd_fw_resp_frame_done(struct isp4_subdev *isp_subdev,
return;
}
dev_dbg(dev, "ts:%llu,streamId:%d,poc:%u,preview_en:%u,status:%i\n",
dev_dbg(dev, "ts:%llu,streamId:%d,poc:%u,preview_en:%u,status:%s(%i)\n",
ktime_get_ns(), stream_id, meta->poc, meta->preview.enabled,
isp4dbg_get_buf_done_str(meta->preview.status),
meta->preview.status);
if (meta->preview.enabled &&
@ -468,6 +472,8 @@ static void isp4sd_fw_resp_frame_done(struct isp4_subdev *isp_subdev,
meta->preview.status == ISP4FW_BUFFER_STATUS_DIRTY)) {
prev = isp4if_dequeue_buffer(ispif);
if (prev) {
isp4dbg_show_bufmeta_info(dev, "prev", &meta->preview,
&prev->buf_info);
isp4vid_handle_frame_done(&isp_subdev->isp_vdev,
&prev->buf_info);
isp4if_dealloc_buffer_node(prev);
@ -475,8 +481,9 @@ static void isp4sd_fw_resp_frame_done(struct isp4_subdev *isp_subdev,
dev_err(dev, "fail null prev buf\n");
}
} else if (meta->preview.enabled) {
dev_err(dev, "fail bad preview status %u\n",
meta->preview.status);
dev_err(dev, "fail bad preview status %u(%s)\n",
meta->preview.status,
isp4dbg_get_buf_done_str(meta->preview.status));
}
if (isp_subdev->sensor_info.status == ISP4SD_START_STATUS_STARTED)
@ -493,6 +500,9 @@ static void isp4sd_fw_resp_func(struct isp4_subdev *isp_subdev,
struct device *dev = isp_subdev->dev;
struct isp4fw_resp resp;
if (stream_id == ISP4IF_STREAM_ID_1)
isp_fw_log_print(isp_subdev);
while (true) {
if (isp4if_f2h_resp(ispif, stream_id, &resp)) {
/* Re-enable the interrupt */
@ -522,7 +532,8 @@ static void isp4sd_fw_resp_func(struct isp4_subdev *isp_subdev,
&resp.param.frame_done);
break;
default:
dev_err(dev, "-><- fail respid (0x%x)\n",
dev_err(dev, "-><- fail respid %s(0x%x)\n",
isp4dbg_get_resp_str(resp.resp_id),
resp.resp_id);
break;
}

View File

@ -109,6 +109,11 @@ struct isp4_subdev {
bool irq_enabled;
/* spin lock to access ISP_SYS_INT0_EN exclusively */
spinlock_t irq_lock;
#ifdef CONFIG_DEBUG_FS
bool enable_fw_log;
struct dentry *debugfs_dir;
char *fw_log_output;
#endif
};
int isp4sd_init(struct isp4_subdev *isp_subdev, struct v4l2_device *v4l2_dev,