diff mbox series

[4/8] staging: media: zoran: add debugfs

Message ID 20210903191540.3052775-5-clabbe@baylibre.com
State New
Headers show
Series staging: media: zoran: fusion in one module | expand

Commit Message

Corentin Labbe Sept. 3, 2021, 7:15 p.m. UTC
Add debugfs for displaying zoran debug and stats information.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 drivers/staging/media/zoran/Kconfig      | 10 ++++++
 drivers/staging/media/zoran/zoran.h      |  5 +++
 drivers/staging/media/zoran/zoran_card.c | 39 ++++++++++++++++++++++++
 3 files changed, 54 insertions(+)

Comments

Greg Kroah-Hartman Sept. 4, 2021, 5:53 a.m. UTC | #1
On Fri, Sep 03, 2021 at 07:15:36PM +0000, Corentin Labbe wrote:
> Add debugfs for displaying zoran debug and stats information.

> 

> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

> ---

>  drivers/staging/media/zoran/Kconfig      | 10 ++++++

>  drivers/staging/media/zoran/zoran.h      |  5 +++

>  drivers/staging/media/zoran/zoran_card.c | 39 ++++++++++++++++++++++++

>  3 files changed, 54 insertions(+)

> 

> diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig

> index 7874842033ca..7d2d3c2431b1 100644

> --- a/drivers/staging/media/zoran/Kconfig

> +++ b/drivers/staging/media/zoran/Kconfig

> @@ -74,3 +74,13 @@ config VIDEO_ZORAN_AVS6EYES

>  	select VIDEO_KS0127 if MEDIA_SUBDRV_AUTOSELECT

>  	help

>  	  Support for the AverMedia 6 Eyes video surveillance card.

> +

> +config VIDEO_ZORAN_DEBUG

> +	bool "Enable zoran debugfs"

> +	depends on VIDEO_ZORAN

> +	depends on DEBUG_FS

> +	help

> +	  Say y to enable zoran debug file.

> +	  This will create /sys/kernel/debug/CARD_NAME/debug for displaying

> +	  stats and debug information.

> +

> diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h

> index b1ad2a2b914c..8c271005f14d 100644

> --- a/drivers/staging/media/zoran/zoran.h

> +++ b/drivers/staging/media/zoran/zoran.h

> @@ -18,6 +18,7 @@

>  #ifndef _BUZ_H_

>  #define _BUZ_H_

>  

> +#include <linux/debugfs.h>

>  #include <media/v4l2-device.h>

>  #include <media/v4l2-ctrls.h>

>  #include <media/videobuf2-core.h>

> @@ -295,6 +296,10 @@ struct zoran {

>  	struct list_head queued_bufs;

>  	spinlock_t queued_bufs_lock; /* Protects queued_bufs */

>  	struct zr_buffer *inuse[BUZ_NUM_STAT_COM * 2];

> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG

> +	struct dentry *dbgfs_dir;

> +	struct dentry *dbgfs_file;


No need for these, the file is never referenced and the directory can be
looked up when you want to remove it.

> +#endif

>  };

>  

>  static inline struct zoran *to_zoran(struct v4l2_device *v4l2_dev)

> diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c

> index f1465fbf98af..1ed8ed2f4f7f 100644

> --- a/drivers/staging/media/zoran/zoran_card.c

> +++ b/drivers/staging/media/zoran/zoran_card.c

> @@ -1051,6 +1051,39 @@ static const struct v4l2_ctrl_ops zoran_video_ctrl_ops = {

>  	.s_ctrl = zoran_video_set_ctrl,

>  };

>  

> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG

> +static int zoran_debugfs_show(struct seq_file *seq, void *v)

> +{

> +	struct zoran *zr = seq->private;

> +

> +	seq_printf(seq, "Running mode %x\n", zr->running);

> +	seq_printf(seq, "Codec mode %x\n", zr->codec_mode);

> +	seq_printf(seq, "Norm %x\n", zr->norm);

> +	seq_printf(seq, "Input %d\n", zr->input);

> +	seq_printf(seq, "Buffersize %d\n", zr->buffer_size);

> +

> +	seq_printf(seq, "V4L width %dx%d\n", zr->v4l_settings.width, zr->v4l_settings.height);

> +	seq_printf(seq, "V4L bytesperline %d\n", zr->v4l_settings.bytesperline);

> +

> +	seq_printf(seq, "JPG decimation %u\n", zr->jpg_settings.decimation);

> +	seq_printf(seq, "JPG hor_dcm %u\n", zr->jpg_settings.hor_dcm);

> +	seq_printf(seq, "JPG ver_dcm %u\n", zr->jpg_settings.ver_dcm);

> +	seq_printf(seq, "JPG tmp_dcm %u\n", zr->jpg_settings.tmp_dcm);

> +	seq_printf(seq, "JPG odd_even %u\n", zr->jpg_settings.odd_even);

> +	seq_printf(seq, "JPG crop %dx%d %d %d\n",

> +		zr->jpg_settings.img_x,

> +		zr->jpg_settings.img_y,

> +		zr->jpg_settings.img_width,

> +		zr->jpg_settings.img_height);

> +

> +	seq_printf(seq, "Prepared %u\n", zr->prepared);

> +	seq_printf(seq, "Queued %u\n", zr->queued);

> +	return 0;

> +}

> +

> +DEFINE_SHOW_ATTRIBUTE(zoran_debugfs);

> +#endif

> +

>  /*

>   *   Scan for a Buz card (actually for the PCI controller ZR36057),

>   *   request the irq and map the io memory

> @@ -1286,6 +1319,12 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

>  

>  	zr->map_mode = ZORAN_MAP_MODE_RAW;

>  

> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG

> +	zr->dbgfs_dir = debugfs_create_dir(ZR_DEVNAME(zr), NULL);

> +	zr->dbgfs_file = debugfs_create_file("debug", 0444,

> +					      zr->dbgfs_dir, zr,

> +					      &zoran_debugfs_fops);

> +#endif


Wait, when are you removing the files when the device is removed?

That needs to be fixed no matter what before this patch is accepted.

thanks,

greg k-h
kernel test robot Sept. 4, 2021, 6:42 a.m. UTC | #2
Hi Corentin,

I love your patch! Perhaps something to improve:

[auto build test WARNING on staging/staging-testing]

url:    https://github.com/0day-ci/linux/commits/Corentin-Labbe/staging-media-zoran-fusion-in-one-module/20210904-031844
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git 5d7d11dead3ea7191a8e8635fb718d0c3f203fe0
config: x86_64-randconfig-r023-20210904 (attached as .config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 1104e3258b5064e7110cc297e2cec60ac9acfc0a)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/1e16912d8cd1602ddb54f3e43e17021b8daf4e58
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Corentin-Labbe/staging-media-zoran-fusion-in-one-module/20210904-031844
        git checkout 1e16912d8cd1602ddb54f3e43e17021b8daf4e58
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> drivers/staging/media/zoran/zoran_card.c:1061:31: warning: format specifies type 'unsigned int' but the argument has type 'v4l2_std_id' (aka 'unsigned long long') [-Wformat]

           seq_printf(seq, "Norm %x\n", zr->norm);
                                 ~~     ^~~~~~~~
                                 %llx
   1 warning generated.


vim +1061 drivers/staging/media/zoran/zoran_card.c

  1053	
  1054	#ifdef CONFIG_VIDEO_ZORAN_DEBUG
  1055	static int zoran_debugfs_show(struct seq_file *seq, void *v)
  1056	{
  1057		struct zoran *zr = seq->private;
  1058	
  1059		seq_printf(seq, "Running mode %x\n", zr->running);
  1060		seq_printf(seq, "Codec mode %x\n", zr->codec_mode);
> 1061		seq_printf(seq, "Norm %x\n", zr->norm);

  1062		seq_printf(seq, "Input %d\n", zr->input);
  1063		seq_printf(seq, "Buffersize %d\n", zr->buffer_size);
  1064	
  1065		seq_printf(seq, "V4L width %dx%d\n", zr->v4l_settings.width, zr->v4l_settings.height);
  1066		seq_printf(seq, "V4L bytesperline %d\n", zr->v4l_settings.bytesperline);
  1067	
  1068		seq_printf(seq, "JPG decimation %u\n", zr->jpg_settings.decimation);
  1069		seq_printf(seq, "JPG hor_dcm %u\n", zr->jpg_settings.hor_dcm);
  1070		seq_printf(seq, "JPG ver_dcm %u\n", zr->jpg_settings.ver_dcm);
  1071		seq_printf(seq, "JPG tmp_dcm %u\n", zr->jpg_settings.tmp_dcm);
  1072		seq_printf(seq, "JPG odd_even %u\n", zr->jpg_settings.odd_even);
  1073		seq_printf(seq, "JPG crop %dx%d %d %d\n",
  1074			zr->jpg_settings.img_x,
  1075			zr->jpg_settings.img_y,
  1076			zr->jpg_settings.img_width,
  1077			zr->jpg_settings.img_height);
  1078	
  1079		seq_printf(seq, "Prepared %u\n", zr->prepared);
  1080		seq_printf(seq, "Queued %u\n", zr->queued);
  1081		return 0;
  1082	}
  1083	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Hans Verkuil Sept. 6, 2021, 10:20 a.m. UTC | #3
On 03/09/2021 21:15, Corentin Labbe wrote:
> Add debugfs for displaying zoran debug and stats information.

> 

> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

> ---

>  drivers/staging/media/zoran/Kconfig      | 10 ++++++

>  drivers/staging/media/zoran/zoran.h      |  5 +++

>  drivers/staging/media/zoran/zoran_card.c | 39 ++++++++++++++++++++++++

>  3 files changed, 54 insertions(+)

> 

> diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig

> index 7874842033ca..7d2d3c2431b1 100644

> --- a/drivers/staging/media/zoran/Kconfig

> +++ b/drivers/staging/media/zoran/Kconfig

> @@ -74,3 +74,13 @@ config VIDEO_ZORAN_AVS6EYES

>  	select VIDEO_KS0127 if MEDIA_SUBDRV_AUTOSELECT

>  	help

>  	  Support for the AverMedia 6 Eyes video surveillance card.

> +

> +config VIDEO_ZORAN_DEBUG

> +	bool "Enable zoran debugfs"

> +	depends on VIDEO_ZORAN

> +	depends on DEBUG_FS

> +	help

> +	  Say y to enable zoran debug file.

> +	  This will create /sys/kernel/debug/CARD_NAME/debug for displaying

> +	  stats and debug information.

> +

> diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h

> index b1ad2a2b914c..8c271005f14d 100644

> --- a/drivers/staging/media/zoran/zoran.h

> +++ b/drivers/staging/media/zoran/zoran.h

> @@ -18,6 +18,7 @@

>  #ifndef _BUZ_H_

>  #define _BUZ_H_

>  

> +#include <linux/debugfs.h>

>  #include <media/v4l2-device.h>

>  #include <media/v4l2-ctrls.h>

>  #include <media/videobuf2-core.h>

> @@ -295,6 +296,10 @@ struct zoran {

>  	struct list_head queued_bufs;

>  	spinlock_t queued_bufs_lock; /* Protects queued_bufs */

>  	struct zr_buffer *inuse[BUZ_NUM_STAT_COM * 2];

> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG

> +	struct dentry *dbgfs_dir;

> +	struct dentry *dbgfs_file;

> +#endif

>  };

>  

>  static inline struct zoran *to_zoran(struct v4l2_device *v4l2_dev)

> diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c

> index f1465fbf98af..1ed8ed2f4f7f 100644

> --- a/drivers/staging/media/zoran/zoran_card.c

> +++ b/drivers/staging/media/zoran/zoran_card.c

> @@ -1051,6 +1051,39 @@ static const struct v4l2_ctrl_ops zoran_video_ctrl_ops = {

>  	.s_ctrl = zoran_video_set_ctrl,

>  };

>  

> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG

> +static int zoran_debugfs_show(struct seq_file *seq, void *v)

> +{

> +	struct zoran *zr = seq->private;

> +

> +	seq_printf(seq, "Running mode %x\n", zr->running);

> +	seq_printf(seq, "Codec mode %x\n", zr->codec_mode);

> +	seq_printf(seq, "Norm %x\n", zr->norm);


This should be %llx, otherwise you get a compile warning.

Regards,

	Hans

> +	seq_printf(seq, "Input %d\n", zr->input);

> +	seq_printf(seq, "Buffersize %d\n", zr->buffer_size);

> +

> +	seq_printf(seq, "V4L width %dx%d\n", zr->v4l_settings.width, zr->v4l_settings.height);

> +	seq_printf(seq, "V4L bytesperline %d\n", zr->v4l_settings.bytesperline);

> +

> +	seq_printf(seq, "JPG decimation %u\n", zr->jpg_settings.decimation);

> +	seq_printf(seq, "JPG hor_dcm %u\n", zr->jpg_settings.hor_dcm);

> +	seq_printf(seq, "JPG ver_dcm %u\n", zr->jpg_settings.ver_dcm);

> +	seq_printf(seq, "JPG tmp_dcm %u\n", zr->jpg_settings.tmp_dcm);

> +	seq_printf(seq, "JPG odd_even %u\n", zr->jpg_settings.odd_even);

> +	seq_printf(seq, "JPG crop %dx%d %d %d\n",

> +		zr->jpg_settings.img_x,

> +		zr->jpg_settings.img_y,

> +		zr->jpg_settings.img_width,

> +		zr->jpg_settings.img_height);

> +

> +	seq_printf(seq, "Prepared %u\n", zr->prepared);

> +	seq_printf(seq, "Queued %u\n", zr->queued);

> +	return 0;

> +}

> +

> +DEFINE_SHOW_ATTRIBUTE(zoran_debugfs);

> +#endif

> +

>  /*

>   *   Scan for a Buz card (actually for the PCI controller ZR36057),

>   *   request the irq and map the io memory

> @@ -1286,6 +1319,12 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

>  

>  	zr->map_mode = ZORAN_MAP_MODE_RAW;

>  

> +#ifdef CONFIG_VIDEO_ZORAN_DEBUG

> +	zr->dbgfs_dir = debugfs_create_dir(ZR_DEVNAME(zr), NULL);

> +	zr->dbgfs_file = debugfs_create_file("debug", 0444,

> +					      zr->dbgfs_dir, zr,

> +					      &zoran_debugfs_fops);

> +#endif

>  	return 0;

>  

>  zr_detach_vfe:

>
Corentin Labbe Sept. 6, 2021, 1:36 p.m. UTC | #4
Le Sat, Sep 04, 2021 at 07:53:00AM +0200, Greg KH a écrit :
> On Fri, Sep 03, 2021 at 07:15:36PM +0000, Corentin Labbe wrote:

> > Add debugfs for displaying zoran debug and stats information.

> > 

> > Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

> > ---

> >  drivers/staging/media/zoran/Kconfig      | 10 ++++++

> >  drivers/staging/media/zoran/zoran.h      |  5 +++

> >  drivers/staging/media/zoran/zoran_card.c | 39 ++++++++++++++++++++++++

> >  3 files changed, 54 insertions(+)

> > 

> > +#ifdef CONFIG_VIDEO_ZORAN_DEBUG

> > +	struct dentry *dbgfs_dir;

> > +	struct dentry *dbgfs_file;

> 

> No need for these, the file is never referenced and the directory can be

> looked up when you want to remove it.

> 

> > +#endif

[...]
> > +#ifdef CONFIG_VIDEO_ZORAN_DEBUG

> > +	zr->dbgfs_dir = debugfs_create_dir(ZR_DEVNAME(zr), NULL);

> > +	zr->dbgfs_file = debugfs_create_file("debug", 0444,

> > +					      zr->dbgfs_dir, zr,

> > +					      &zoran_debugfs_fops);

> > +#endif

> 

> Wait, when are you removing the files when the device is removed?

> 

> That needs to be fixed no matter what before this patch is accepted.

> 


Hello

Sorry to have forgotten this.
I will fix this.

Thanks
Regards
diff mbox series

Patch

diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig
index 7874842033ca..7d2d3c2431b1 100644
--- a/drivers/staging/media/zoran/Kconfig
+++ b/drivers/staging/media/zoran/Kconfig
@@ -74,3 +74,13 @@  config VIDEO_ZORAN_AVS6EYES
 	select VIDEO_KS0127 if MEDIA_SUBDRV_AUTOSELECT
 	help
 	  Support for the AverMedia 6 Eyes video surveillance card.
+
+config VIDEO_ZORAN_DEBUG
+	bool "Enable zoran debugfs"
+	depends on VIDEO_ZORAN
+	depends on DEBUG_FS
+	help
+	  Say y to enable zoran debug file.
+	  This will create /sys/kernel/debug/CARD_NAME/debug for displaying
+	  stats and debug information.
+
diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h
index b1ad2a2b914c..8c271005f14d 100644
--- a/drivers/staging/media/zoran/zoran.h
+++ b/drivers/staging/media/zoran/zoran.h
@@ -18,6 +18,7 @@ 
 #ifndef _BUZ_H_
 #define _BUZ_H_
 
+#include <linux/debugfs.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
 #include <media/videobuf2-core.h>
@@ -295,6 +296,10 @@  struct zoran {
 	struct list_head queued_bufs;
 	spinlock_t queued_bufs_lock; /* Protects queued_bufs */
 	struct zr_buffer *inuse[BUZ_NUM_STAT_COM * 2];
+#ifdef CONFIG_VIDEO_ZORAN_DEBUG
+	struct dentry *dbgfs_dir;
+	struct dentry *dbgfs_file;
+#endif
 };
 
 static inline struct zoran *to_zoran(struct v4l2_device *v4l2_dev)
diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
index f1465fbf98af..1ed8ed2f4f7f 100644
--- a/drivers/staging/media/zoran/zoran_card.c
+++ b/drivers/staging/media/zoran/zoran_card.c
@@ -1051,6 +1051,39 @@  static const struct v4l2_ctrl_ops zoran_video_ctrl_ops = {
 	.s_ctrl = zoran_video_set_ctrl,
 };
 
+#ifdef CONFIG_VIDEO_ZORAN_DEBUG
+static int zoran_debugfs_show(struct seq_file *seq, void *v)
+{
+	struct zoran *zr = seq->private;
+
+	seq_printf(seq, "Running mode %x\n", zr->running);
+	seq_printf(seq, "Codec mode %x\n", zr->codec_mode);
+	seq_printf(seq, "Norm %x\n", zr->norm);
+	seq_printf(seq, "Input %d\n", zr->input);
+	seq_printf(seq, "Buffersize %d\n", zr->buffer_size);
+
+	seq_printf(seq, "V4L width %dx%d\n", zr->v4l_settings.width, zr->v4l_settings.height);
+	seq_printf(seq, "V4L bytesperline %d\n", zr->v4l_settings.bytesperline);
+
+	seq_printf(seq, "JPG decimation %u\n", zr->jpg_settings.decimation);
+	seq_printf(seq, "JPG hor_dcm %u\n", zr->jpg_settings.hor_dcm);
+	seq_printf(seq, "JPG ver_dcm %u\n", zr->jpg_settings.ver_dcm);
+	seq_printf(seq, "JPG tmp_dcm %u\n", zr->jpg_settings.tmp_dcm);
+	seq_printf(seq, "JPG odd_even %u\n", zr->jpg_settings.odd_even);
+	seq_printf(seq, "JPG crop %dx%d %d %d\n",
+		zr->jpg_settings.img_x,
+		zr->jpg_settings.img_y,
+		zr->jpg_settings.img_width,
+		zr->jpg_settings.img_height);
+
+	seq_printf(seq, "Prepared %u\n", zr->prepared);
+	seq_printf(seq, "Queued %u\n", zr->queued);
+	return 0;
+}
+
+DEFINE_SHOW_ATTRIBUTE(zoran_debugfs);
+#endif
+
 /*
  *   Scan for a Buz card (actually for the PCI controller ZR36057),
  *   request the irq and map the io memory
@@ -1286,6 +1319,12 @@  static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	zr->map_mode = ZORAN_MAP_MODE_RAW;
 
+#ifdef CONFIG_VIDEO_ZORAN_DEBUG
+	zr->dbgfs_dir = debugfs_create_dir(ZR_DEVNAME(zr), NULL);
+	zr->dbgfs_file = debugfs_create_file("debug", 0444,
+					      zr->dbgfs_dir, zr,
+					      &zoran_debugfs_fops);
+#endif
 	return 0;
 
 zr_detach_vfe: