| Message ID | 20230322094617.19410-3-yunfei.dong@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: mediatek: vcodec: Add debugfs file for decode and encode | expand |
Il 22/03/23 10:46, Yunfei Dong ha scritto: > Add parameter mtk_vcodec_dbg to open each codec log. > Add parameter mtk_v4l2_dbg_level to open each instance log according to > the parameter value. > > Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> > --- > .../mediatek/vcodec/mtk_vcodec_dbgfs.c | 2 ++ > .../mediatek/vcodec/mtk_vcodec_util.c | 8 ++++++ > .../mediatek/vcodec/mtk_vcodec_util.h | 25 ++++++++++++++++--- > 3 files changed, 32 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > index fb9edd379af5..b5093e4e4aa2 100644 > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > @@ -20,6 +20,8 @@ void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev) > IS_ERR(vcodec_dev->dbgfs.vcodec_root)); > > vcodec_root = vcodec_dev->dbgfs.vcodec_root; > + debugfs_create_x32("mtk_v4l2_dbg_level", 0644, vcodec_root, &mtk_v4l2_dbg_level); > + debugfs_create_x32("mtk_vcodec_dbg", 0644, vcodec_root, &mtk_vcodec_dbg); > } > EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_init); > > diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c > index ace78c4b5b9e..f214e6f67005 100644 > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c > @@ -13,6 +13,14 @@ > #include "mtk_vcodec_drv.h" > #include "mtk_vcodec_util.h" > > +#if defined(CONFIG_DEBUG_FS) > +int mtk_vcodec_dbg; > +EXPORT_SYMBOL(mtk_vcodec_dbg); > + > +int mtk_v4l2_dbg_level; > +EXPORT_SYMBOL(mtk_v4l2_dbg_level); > +#endif > + > void __iomem *mtk_vcodec_get_reg_addr(struct mtk_vcodec_ctx *data, > unsigned int reg_idx) > { > diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h > index 71956627a0e2..938f03cab3c9 100644 > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h > @@ -35,15 +35,34 @@ struct mtk_vcodec_dev; > pr_err("[MTK_VCODEC][ERROR][%d]: " fmt "\n", \ > ((struct mtk_vcodec_ctx *)(h)->ctx)->id, ##args) > > +#if defined(CONFIG_DEBUG_FS) > +extern int mtk_v4l2_dbg_level; > +extern int mtk_vcodec_dbg; > > -#define mtk_v4l2_debug(level, fmt, args...) pr_debug(fmt, ##args) > +#define mtk_v4l2_debug(level, fmt, args...) \ > + do { \ > + if (mtk_v4l2_dbg_level >= level) \ > + pr_info("[MTK_V4L2] level=%d %s(),%d: " fmt "\n", \ These shall still be *debug* and not *info*, even if you're controlling the log level from debugfs, as these are anyway debugging prints which can be automatically optimized out for a kernel build with *no debug at all*. The loglevel control is a commodity that should be meant to avoid too much spam for readability and/or selectively enable "components" logging, because then there's also the tracing framework providing maximum verbosity. Besides, I'd be happy if this finally becomes dev_dbg instead of pr_debug. Regards, Angelo
Hi AngeloGioacchino Thanks for you suggestion. On Wed, 2023-03-22 at 14:49 +0100, AngeloGioacchino Del Regno wrote: > External email : Please do not click links or open attachments until > you have verified the sender or the content. > > > Il 22/03/23 10:46, Yunfei Dong ha scritto: > > Add parameter mtk_vcodec_dbg to open each codec log. > > Add parameter mtk_v4l2_dbg_level to open each instance log > > according to > > the parameter value. > > > > Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> > > --- > > .../mediatek/vcodec/mtk_vcodec_dbgfs.c | 2 ++ > > .../mediatek/vcodec/mtk_vcodec_util.c | 8 ++++++ > > .../mediatek/vcodec/mtk_vcodec_util.h | 25 > > ++++++++++++++++--- > > 3 files changed, 32 insertions(+), 3 deletions(-) > > > > diff --git > > a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > > b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > > index fb9edd379af5..b5093e4e4aa2 100644 > > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > > @@ -20,6 +20,8 @@ void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev > > *vcodec_dev) > > IS_ERR(vcodec_dev->dbgfs.vcodec_root)); > > > > vcodec_root = vcodec_dev->dbgfs.vcodec_root; > > + debugfs_create_x32("mtk_v4l2_dbg_level", 0644, vcodec_root, > > &mtk_v4l2_dbg_level); > > + debugfs_create_x32("mtk_vcodec_dbg", 0644, vcodec_root, > > &mtk_vcodec_dbg); > > } > > EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_init); > > > > diff --git > > a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c > > b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c > > index ace78c4b5b9e..f214e6f67005 100644 > > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c > > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c > > @@ -13,6 +13,14 @@ > > #include "mtk_vcodec_drv.h" > > #include "mtk_vcodec_util.h" > > > > +#if defined(CONFIG_DEBUG_FS) > > +int mtk_vcodec_dbg; > > +EXPORT_SYMBOL(mtk_vcodec_dbg); > > + > > +int mtk_v4l2_dbg_level; > > +EXPORT_SYMBOL(mtk_v4l2_dbg_level); > > +#endif > > + > > void __iomem *mtk_vcodec_get_reg_addr(struct mtk_vcodec_ctx > > *data, > > unsigned int reg_idx) > > { > > diff --git > > a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h > > b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h > > index 71956627a0e2..938f03cab3c9 100644 > > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h > > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h > > @@ -35,15 +35,34 @@ struct mtk_vcodec_dev; > > pr_err("[MTK_VCODEC][ERROR][%d]: " fmt "\n", \ > > ((struct mtk_vcodec_ctx *)(h)->ctx)->id, ##args) > > > > +#if defined(CONFIG_DEBUG_FS) > > +extern int mtk_v4l2_dbg_level; > > +extern int mtk_vcodec_dbg; > > > > -#define mtk_v4l2_debug(level, fmt, args...) pr_debug(fmt, ##args) > > +#define mtk_v4l2_debug(level, fmt, > > args...) \ > > + do > > { \ > > + if (mtk_v4l2_dbg_level >= > > level) \ > > + pr_info("[MTK_V4L2] level=%d %s(),%d: " fmt > > "\n", \ > > These shall still be *debug* and not *info*, even if you're > controlling the > log level from debugfs, as these are anyway debugging prints which > can be > automatically optimized out for a kernel build with *no debug at > all*. > I can change it from *info* to *debug*. > The loglevel control is a commodity that should be meant to avoid too > much > spam for readability and/or selectively enable "components" logging, > because > then there's also the tracing framework providing maximum verbosity. > I can't understand here very well. Whether you mean that just need to print useful debug information, no need to add so many prefix "[MTK_V4L2] level=%d %s(),"? > Besides, I'd be happy if this finally becomes dev_dbg instead of > pr_debug. > Need to change so many log to use dev_dbg, pr_debug should be also ok. Maybe I can change it with dev_dbg in the future. > Regards, > Angelo > Best Regards, Yunfei Dong >
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c index fb9edd379af5..b5093e4e4aa2 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c @@ -20,6 +20,8 @@ void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev) IS_ERR(vcodec_dev->dbgfs.vcodec_root)); vcodec_root = vcodec_dev->dbgfs.vcodec_root; + debugfs_create_x32("mtk_v4l2_dbg_level", 0644, vcodec_root, &mtk_v4l2_dbg_level); + debugfs_create_x32("mtk_vcodec_dbg", 0644, vcodec_root, &mtk_vcodec_dbg); } EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_init); diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c index ace78c4b5b9e..f214e6f67005 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.c @@ -13,6 +13,14 @@ #include "mtk_vcodec_drv.h" #include "mtk_vcodec_util.h" +#if defined(CONFIG_DEBUG_FS) +int mtk_vcodec_dbg; +EXPORT_SYMBOL(mtk_vcodec_dbg); + +int mtk_v4l2_dbg_level; +EXPORT_SYMBOL(mtk_v4l2_dbg_level); +#endif + void __iomem *mtk_vcodec_get_reg_addr(struct mtk_vcodec_ctx *data, unsigned int reg_idx) { diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h index 71956627a0e2..938f03cab3c9 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h @@ -35,15 +35,34 @@ struct mtk_vcodec_dev; pr_err("[MTK_VCODEC][ERROR][%d]: " fmt "\n", \ ((struct mtk_vcodec_ctx *)(h)->ctx)->id, ##args) +#if defined(CONFIG_DEBUG_FS) +extern int mtk_v4l2_dbg_level; +extern int mtk_vcodec_dbg; -#define mtk_v4l2_debug(level, fmt, args...) pr_debug(fmt, ##args) +#define mtk_v4l2_debug(level, fmt, args...) \ + do { \ + if (mtk_v4l2_dbg_level >= level) \ + pr_info("[MTK_V4L2] level=%d %s(),%d: " fmt "\n", \ + level, __func__, __LINE__, ##args); \ + } while (0) -#define mtk_v4l2_debug_enter() mtk_v4l2_debug(3, "+") -#define mtk_v4l2_debug_leave() mtk_v4l2_debug(3, "-") +#define mtk_vcodec_debug(h, fmt, args...) \ + do { \ + if (mtk_vcodec_dbg) \ + pr_info("[MTK_VCODEC][%d]: %s() " fmt "\n", \ + ((struct mtk_vcodec_ctx *)h->ctx)->id, \ + __func__, ##args); \ + } while (0) +#else +#define mtk_v4l2_debug(level, fmt, args...) pr_debug(fmt, ##args) #define mtk_vcodec_debug(h, fmt, args...) \ pr_debug("[MTK_VCODEC][%d]: " fmt "\n", \ ((struct mtk_vcodec_ctx *)(h)->ctx)->id, ##args) +#endif + +#define mtk_v4l2_debug_enter() mtk_v4l2_debug(3, "+") +#define mtk_v4l2_debug_leave() mtk_v4l2_debug(3, "-") #define mtk_vcodec_debug_enter(h) mtk_vcodec_debug(h, "+") #define mtk_vcodec_debug_leave(h) mtk_vcodec_debug(h, "-")
Add parameter mtk_vcodec_dbg to open each codec log. Add parameter mtk_v4l2_dbg_level to open each instance log according to the parameter value. Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> --- .../mediatek/vcodec/mtk_vcodec_dbgfs.c | 2 ++ .../mediatek/vcodec/mtk_vcodec_util.c | 8 ++++++ .../mediatek/vcodec/mtk_vcodec_util.h | 25 ++++++++++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-)