diff mbox series

[v4,1/3] venus: Add debugfs interface to set firmware log level

Message ID 20200613223919.7038-2-stanimir.varbanov@linaro.org (mailing list archive)
State Superseded
Headers show
Series Venus dynamic debug | expand

Commit Message

Stanimir Varbanov June 13, 2020, 10:39 p.m. UTC 
This will be useful when debugging specific issues related to
firmware HFI interface.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
 drivers/media/platform/qcom/venus/Makefile    |  2 +-
 drivers/media/platform/qcom/venus/core.c      |  3 +++
 drivers/media/platform/qcom/venus/core.h      |  3 +++
 drivers/media/platform/qcom/venus/dbgfs.c     | 21 +++++++++++++++++++
 drivers/media/platform/qcom/venus/dbgfs.h     | 12 +++++++++++
 drivers/media/platform/qcom/venus/hfi_venus.c |  7 ++++++-
 6 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 drivers/media/platform/qcom/venus/dbgfs.c
 create mode 100644 drivers/media/platform/qcom/venus/dbgfs.h

Comments

Greg KH June 14, 2020, 6:35 a.m. UTC | #1 
On Sun, Jun 14, 2020 at 01:39:17AM +0300, Stanimir Varbanov wrote:
> This will be useful when debugging specific issues related to
> firmware HFI interface.
> 
> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>

You didn't cc: any of us on the patchs, like you did on 0/3 :(


> ---
>  drivers/media/platform/qcom/venus/Makefile    |  2 +-
>  drivers/media/platform/qcom/venus/core.c      |  3 +++
>  drivers/media/platform/qcom/venus/core.h      |  3 +++
>  drivers/media/platform/qcom/venus/dbgfs.c     | 21 +++++++++++++++++++
>  drivers/media/platform/qcom/venus/dbgfs.h     | 12 +++++++++++
>  drivers/media/platform/qcom/venus/hfi_venus.c |  7 ++++++-
>  6 files changed, 46 insertions(+), 2 deletions(-)
>  create mode 100644 drivers/media/platform/qcom/venus/dbgfs.c
>  create mode 100644 drivers/media/platform/qcom/venus/dbgfs.h
> 
> diff --git a/drivers/media/platform/qcom/venus/Makefile b/drivers/media/platform/qcom/venus/Makefile
> index 64af0bc1edae..dfc636865709 100644
> --- a/drivers/media/platform/qcom/venus/Makefile
> +++ b/drivers/media/platform/qcom/venus/Makefile
> @@ -3,7 +3,7 @@
>  
>  venus-core-objs += core.o helpers.o firmware.o \
>  		   hfi_venus.o hfi_msgs.o hfi_cmds.o hfi.o \
> -		   hfi_parser.o pm_helpers.o
> +		   hfi_parser.o pm_helpers.o dbgfs.o
>  
>  venus-dec-objs += vdec.o vdec_ctrls.o
>  venus-enc-objs += venc.o venc_ctrls.o
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index 203c6538044f..249141e27fea 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -290,6 +290,8 @@ static int venus_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto err_dev_unregister;
>  
> +	venus_dbgfs_init(core);
> +
>  	return 0;
>  
>  err_dev_unregister:
> @@ -337,6 +339,7 @@ static int venus_remove(struct platform_device *pdev)
>  	v4l2_device_unregister(&core->v4l2_dev);
>  	mutex_destroy(&core->pm_lock);
>  	mutex_destroy(&core->lock);
> +	venus_dbgfs_deinit(core);
>  
>  	return ret;
>  }
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index 7118612673c9..b48782f9aa95 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -12,6 +12,7 @@
>  #include <media/v4l2-ctrls.h>
>  #include <media/v4l2-device.h>
>  
> +#include "dbgfs.h"
>  #include "hfi.h"
>  
>  #define VIDC_CLKS_NUM_MAX		4
> @@ -136,6 +137,7 @@ struct venus_caps {
>   * @priv:	a private filed for HFI operations
>   * @ops:		the core HFI operations
>   * @work:	a delayed work for handling system fatal error
> + * @root:	debugfs root directory
>   */
>  struct venus_core {
>  	void __iomem *base;
> @@ -185,6 +187,7 @@ struct venus_core {
>  	unsigned int codecs_count;
>  	unsigned int core0_usage_count;
>  	unsigned int core1_usage_count;
> +	struct dentry *root;
>  };
>  
>  struct vdec_controls {
> diff --git a/drivers/media/platform/qcom/venus/dbgfs.c b/drivers/media/platform/qcom/venus/dbgfs.c
> new file mode 100644
> index 000000000000..782d54ac1b8f
> --- /dev/null
> +++ b/drivers/media/platform/qcom/venus/dbgfs.c
> @@ -0,0 +1,21 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (C) 2020 Linaro Ltd.
> + */
> +
> +#include <linux/debugfs.h>
> +
> +#include "core.h"
> +
> +extern int venus_fw_debug;
> +
> +void venus_dbgfs_init(struct venus_core *core)
> +{
> +	core->root = debugfs_create_dir("venus", NULL);
> +	debugfs_create_x32("fw_level", 0644, core->root, &venus_fw_debug);
> +}
> +
> +void venus_dbgfs_deinit(struct venus_core *core)
> +{
> +	debugfs_remove_recursive(core->root);
> +}
> diff --git a/drivers/media/platform/qcom/venus/dbgfs.h b/drivers/media/platform/qcom/venus/dbgfs.h
> new file mode 100644
> index 000000000000..b7b621a8472f
> --- /dev/null
> +++ b/drivers/media/platform/qcom/venus/dbgfs.h
> @@ -0,0 +1,12 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/* Copyright (C) 2020 Linaro Ltd. */
> +
> +#ifndef __VENUS_DBGFS_H__
> +#define __VENUS_DBGFS_H__
> +
> +struct venus_core;
> +
> +void venus_dbgfs_init(struct venus_core *core);
> +void venus_dbgfs_deinit(struct venus_core *core);
> +
> +#endif
> diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
> index 0d8855014ab3..3a04b08ab85a 100644
> --- a/drivers/media/platform/qcom/venus/hfi_venus.c
> +++ b/drivers/media/platform/qcom/venus/hfi_venus.c
> @@ -130,7 +130,7 @@ struct venus_hfi_device {
>  };
>  
>  static bool venus_pkt_debug;
> -static int venus_fw_debug = HFI_DEBUG_MSG_ERROR | HFI_DEBUG_MSG_FATAL;
> +int venus_fw_debug = HFI_DEBUG_MSG_ERROR | HFI_DEBUG_MSG_FATAL;
>  static bool venus_sys_idle_indicator;
>  static bool venus_fw_low_power_mode = true;
>  static int venus_hw_rsp_timeout = 1000;
> @@ -1130,9 +1130,14 @@ static int venus_session_init(struct venus_inst *inst, u32 session_type,
>  			      u32 codec)
>  {
>  	struct venus_hfi_device *hdev = to_hfi_priv(inst->core);
> +	struct device *dev = hdev->core->dev;
>  	struct hfi_session_init_pkt pkt;
>  	int ret;
>  
> +	ret = venus_sys_set_debug(hdev, venus_fw_debug);
> +	if (ret)
> +		dev_warn(dev, "setting fw debug msg ON failed (%d)\n", ret);

Why do you care about this to tell the user about it?

thanks,

greg k-h
Stanimir Varbanov June 15, 2020, 10:34 a.m. UTC | #2 
Hi Greg,

On 6/14/20 9:35 AM, Greg KH wrote:
> On Sun, Jun 14, 2020 at 01:39:17AM +0300, Stanimir Varbanov wrote:
>> This will be useful when debugging specific issues related to
>> firmware HFI interface.
>>
>> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
> 
> You didn't cc: any of us on the patchs, like you did on 0/3 :(

yes, sorry about that.

> 
> 
>> ---
>>  drivers/media/platform/qcom/venus/Makefile    |  2 +-
>>  drivers/media/platform/qcom/venus/core.c      |  3 +++
>>  drivers/media/platform/qcom/venus/core.h      |  3 +++
>>  drivers/media/platform/qcom/venus/dbgfs.c     | 21 +++++++++++++++++++
>>  drivers/media/platform/qcom/venus/dbgfs.h     | 12 +++++++++++
>>  drivers/media/platform/qcom/venus/hfi_venus.c |  7 ++++++-
>>  6 files changed, 46 insertions(+), 2 deletions(-)
>>  create mode 100644 drivers/media/platform/qcom/venus/dbgfs.c
>>  create mode 100644 drivers/media/platform/qcom/venus/dbgfs.h
>>
>> diff --git a/drivers/media/platform/qcom/venus/Makefile b/drivers/media/platform/qcom/venus/Makefile
>> index 64af0bc1edae..dfc636865709 100644
>> --- a/drivers/media/platform/qcom/venus/Makefile
>> +++ b/drivers/media/platform/qcom/venus/Makefile
>> @@ -3,7 +3,7 @@
>>  
>>  venus-core-objs += core.o helpers.o firmware.o \
>>  		   hfi_venus.o hfi_msgs.o hfi_cmds.o hfi.o \
>> -		   hfi_parser.o pm_helpers.o
>> +		   hfi_parser.o pm_helpers.o dbgfs.o
>>  
>>  venus-dec-objs += vdec.o vdec_ctrls.o
>>  venus-enc-objs += venc.o venc_ctrls.o
>> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
>> index 203c6538044f..249141e27fea 100644
>> --- a/drivers/media/platform/qcom/venus/core.c
>> +++ b/drivers/media/platform/qcom/venus/core.c
>> @@ -290,6 +290,8 @@ static int venus_probe(struct platform_device *pdev)
>>  	if (ret)
>>  		goto err_dev_unregister;
>>  
>> +	venus_dbgfs_init(core);
>> +
>>  	return 0;
>>  
>>  err_dev_unregister:
>> @@ -337,6 +339,7 @@ static int venus_remove(struct platform_device *pdev)
>>  	v4l2_device_unregister(&core->v4l2_dev);
>>  	mutex_destroy(&core->pm_lock);
>>  	mutex_destroy(&core->lock);
>> +	venus_dbgfs_deinit(core);
>>  
>>  	return ret;
>>  }
>> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
>> index 7118612673c9..b48782f9aa95 100644
>> --- a/drivers/media/platform/qcom/venus/core.h
>> +++ b/drivers/media/platform/qcom/venus/core.h
>> @@ -12,6 +12,7 @@
>>  #include <media/v4l2-ctrls.h>
>>  #include <media/v4l2-device.h>
>>  
>> +#include "dbgfs.h"
>>  #include "hfi.h"
>>  
>>  #define VIDC_CLKS_NUM_MAX		4
>> @@ -136,6 +137,7 @@ struct venus_caps {
>>   * @priv:	a private filed for HFI operations
>>   * @ops:		the core HFI operations
>>   * @work:	a delayed work for handling system fatal error
>> + * @root:	debugfs root directory
>>   */
>>  struct venus_core {
>>  	void __iomem *base;
>> @@ -185,6 +187,7 @@ struct venus_core {
>>  	unsigned int codecs_count;
>>  	unsigned int core0_usage_count;
>>  	unsigned int core1_usage_count;
>> +	struct dentry *root;
>>  };
>>  
>>  struct vdec_controls {
>> diff --git a/drivers/media/platform/qcom/venus/dbgfs.c b/drivers/media/platform/qcom/venus/dbgfs.c
>> new file mode 100644
>> index 000000000000..782d54ac1b8f
>> --- /dev/null
>> +++ b/drivers/media/platform/qcom/venus/dbgfs.c
>> @@ -0,0 +1,21 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/*
>> + * Copyright (C) 2020 Linaro Ltd.
>> + */
>> +
>> +#include <linux/debugfs.h>
>> +
>> +#include "core.h"
>> +
>> +extern int venus_fw_debug;
>> +
>> +void venus_dbgfs_init(struct venus_core *core)
>> +{
>> +	core->root = debugfs_create_dir("venus", NULL);
>> +	debugfs_create_x32("fw_level", 0644, core->root, &venus_fw_debug);
>> +}
>> +
>> +void venus_dbgfs_deinit(struct venus_core *core)
>> +{
>> +	debugfs_remove_recursive(core->root);
>> +}
>> diff --git a/drivers/media/platform/qcom/venus/dbgfs.h b/drivers/media/platform/qcom/venus/dbgfs.h
>> new file mode 100644
>> index 000000000000..b7b621a8472f
>> --- /dev/null
>> +++ b/drivers/media/platform/qcom/venus/dbgfs.h
>> @@ -0,0 +1,12 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>> +/* Copyright (C) 2020 Linaro Ltd. */
>> +
>> +#ifndef __VENUS_DBGFS_H__
>> +#define __VENUS_DBGFS_H__
>> +
>> +struct venus_core;
>> +
>> +void venus_dbgfs_init(struct venus_core *core);
>> +void venus_dbgfs_deinit(struct venus_core *core);
>> +
>> +#endif
>> diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
>> index 0d8855014ab3..3a04b08ab85a 100644
>> --- a/drivers/media/platform/qcom/venus/hfi_venus.c
>> +++ b/drivers/media/platform/qcom/venus/hfi_venus.c
>> @@ -130,7 +130,7 @@ struct venus_hfi_device {
>>  };
>>  
>>  static bool venus_pkt_debug;
>> -static int venus_fw_debug = HFI_DEBUG_MSG_ERROR | HFI_DEBUG_MSG_FATAL;
>> +int venus_fw_debug = HFI_DEBUG_MSG_ERROR | HFI_DEBUG_MSG_FATAL;
>>  static bool venus_sys_idle_indicator;
>>  static bool venus_fw_low_power_mode = true;
>>  static int venus_hw_rsp_timeout = 1000;
>> @@ -1130,9 +1130,14 @@ static int venus_session_init(struct venus_inst *inst, u32 session_type,
>>  			      u32 codec)
>>  {
>>  	struct venus_hfi_device *hdev = to_hfi_priv(inst->core);
>> +	struct device *dev = hdev->core->dev;
>>  	struct hfi_session_init_pkt pkt;
>>  	int ret;
>>  
>> +	ret = venus_sys_set_debug(hdev, venus_fw_debug);
>> +	if (ret)
>> +		dev_warn(dev, "setting fw debug msg ON failed (%d)\n", ret);
> 
> Why do you care about this to tell the user about it?

I already answered to this question in previous patchset version. I'll
drop the message and return an error if set_debug fail.

> 
> thanks,
> 
> greg k-h
>
diff mbox series

Patch

diff --git a/drivers/media/platform/qcom/venus/Makefile b/drivers/media/platform/qcom/venus/Makefile
index 64af0bc1edae..dfc636865709 100644
--- a/drivers/media/platform/qcom/venus/Makefile
+++ b/drivers/media/platform/qcom/venus/Makefile
@@ -3,7 +3,7 @@ 
 
 venus-core-objs += core.o helpers.o firmware.o \
 		   hfi_venus.o hfi_msgs.o hfi_cmds.o hfi.o \
-		   hfi_parser.o pm_helpers.o
+		   hfi_parser.o pm_helpers.o dbgfs.o
 
 venus-dec-objs += vdec.o vdec_ctrls.o
 venus-enc-objs += venc.o venc_ctrls.o
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 203c6538044f..249141e27fea 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -290,6 +290,8 @@  static int venus_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_dev_unregister;
 
+	venus_dbgfs_init(core);
+
 	return 0;
 
 err_dev_unregister:
@@ -337,6 +339,7 @@  static int venus_remove(struct platform_device *pdev)
 	v4l2_device_unregister(&core->v4l2_dev);
 	mutex_destroy(&core->pm_lock);
 	mutex_destroy(&core->lock);
+	venus_dbgfs_deinit(core);
 
 	return ret;
 }
diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 7118612673c9..b48782f9aa95 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -12,6 +12,7 @@ 
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 
+#include "dbgfs.h"
 #include "hfi.h"
 
 #define VIDC_CLKS_NUM_MAX		4
@@ -136,6 +137,7 @@  struct venus_caps {
  * @priv:	a private filed for HFI operations
  * @ops:		the core HFI operations
  * @work:	a delayed work for handling system fatal error
+ * @root:	debugfs root directory
  */
 struct venus_core {
 	void __iomem *base;
@@ -185,6 +187,7 @@  struct venus_core {
 	unsigned int codecs_count;
 	unsigned int core0_usage_count;
 	unsigned int core1_usage_count;
+	struct dentry *root;
 };
 
 struct vdec_controls {
diff --git a/drivers/media/platform/qcom/venus/dbgfs.c b/drivers/media/platform/qcom/venus/dbgfs.c
new file mode 100644
index 000000000000..782d54ac1b8f
--- /dev/null
+++ b/drivers/media/platform/qcom/venus/dbgfs.c
@@ -0,0 +1,21 @@ 
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2020 Linaro Ltd.
+ */
+
+#include <linux/debugfs.h>
+
+#include "core.h"
+
+extern int venus_fw_debug;
+
+void venus_dbgfs_init(struct venus_core *core)
+{
+	core->root = debugfs_create_dir("venus", NULL);
+	debugfs_create_x32("fw_level", 0644, core->root, &venus_fw_debug);
+}
+
+void venus_dbgfs_deinit(struct venus_core *core)
+{
+	debugfs_remove_recursive(core->root);
+}
diff --git a/drivers/media/platform/qcom/venus/dbgfs.h b/drivers/media/platform/qcom/venus/dbgfs.h
new file mode 100644
index 000000000000..b7b621a8472f
--- /dev/null
+++ b/drivers/media/platform/qcom/venus/dbgfs.h
@@ -0,0 +1,12 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2020 Linaro Ltd. */
+
+#ifndef __VENUS_DBGFS_H__
+#define __VENUS_DBGFS_H__
+
+struct venus_core;
+
+void venus_dbgfs_init(struct venus_core *core);
+void venus_dbgfs_deinit(struct venus_core *core);
+
+#endif
diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
index 0d8855014ab3..3a04b08ab85a 100644
--- a/drivers/media/platform/qcom/venus/hfi_venus.c
+++ b/drivers/media/platform/qcom/venus/hfi_venus.c
@@ -130,7 +130,7 @@  struct venus_hfi_device {
 };
 
 static bool venus_pkt_debug;
-static int venus_fw_debug = HFI_DEBUG_MSG_ERROR | HFI_DEBUG_MSG_FATAL;
+int venus_fw_debug = HFI_DEBUG_MSG_ERROR | HFI_DEBUG_MSG_FATAL;
 static bool venus_sys_idle_indicator;
 static bool venus_fw_low_power_mode = true;
 static int venus_hw_rsp_timeout = 1000;
@@ -1130,9 +1130,14 @@  static int venus_session_init(struct venus_inst *inst, u32 session_type,
 			      u32 codec)
 {
 	struct venus_hfi_device *hdev = to_hfi_priv(inst->core);
+	struct device *dev = hdev->core->dev;
 	struct hfi_session_init_pkt pkt;
 	int ret;
 
+	ret = venus_sys_set_debug(hdev, venus_fw_debug);
+	if (ret)
+		dev_warn(dev, "setting fw debug msg ON failed (%d)\n", ret);
+
 	ret = pkt_session_init(&pkt, inst, session_type, codec);
 	if (ret)
 		goto err;