media: venus: Add debugfs interface to set firmware log level

This will be useful when debugging specific issues related to
firmware HFI interface.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/Makefile b/drivers/media/platform/qcom/venus/Makefile
index 64af0bc1edae881a5588cf5489d0ec5df068e68e..dfc6368657091a5c942638a01302a15270c9c98f 100644 (file)
--- 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 83131933e7c9f8ae558497b384269c815aba277e..c5af42873aed79f8db1f1de373259108aa725f6a 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -295,6 +295,8 @@ static int venus_probe(struct platform_device *pdev)
                goto err_dev_unregister;
        }
 
+       venus_dbgfs_init(core);
+
        return 0;
 
 err_dev_unregister:
@@ -346,6 +348,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 8f56605aa5531385cf625ff1db31daf2141b7584..e5a57e16a553c3149ee377acd33dc8ec74c90b3d 100644 (file)
--- 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
@@ -137,6 +138,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;
@@ -190,6 +192,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 (file)
index 0000000..782d54a
--- /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 (file)
index 0000000..b7b621a
--- /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 90067cd8c89261baebd8db511c6b023e1d324323..fefa654b01a673da807de82638660652c807d892 100644 (file)
--- 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;
@@ -1122,6 +1122,10 @@ static int venus_session_init(struct venus_inst *inst, u32 session_type,
        struct hfi_session_init_pkt pkt;
        int ret;
 
+       ret = venus_sys_set_debug(hdev, venus_fw_debug);
+       if (ret)
+               goto err;
+
        ret = pkt_session_init(&pkt, inst, session_type, codec);
        if (ret)
                goto err;