OSDN Git Service

accel/ivpu: Add firmware tracing support
authorStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Wed, 24 May 2023 07:48:44 +0000 (09:48 +0200)
committerStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Fri, 7 Jul 2023 07:33:20 +0000 (09:33 +0200)
Add support for firmware tracing and logging via debugfs.

Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230524074847.866711-3-stanislaw.gruszka@linux.intel.com
drivers/accel/ivpu/Makefile
drivers/accel/ivpu/ivpu_debugfs.c
drivers/accel/ivpu/ivpu_fw.c
drivers/accel/ivpu/ivpu_fw.h
drivers/accel/ivpu/ivpu_fw_log.c [new file with mode: 0644]
drivers/accel/ivpu/ivpu_fw_log.h [new file with mode: 0644]

index 3ca2fb3..9858d9f 100644 (file)
@@ -5,6 +5,7 @@ intel_vpu-y := \
        ivpu_debugfs.o \
        ivpu_drv.o \
        ivpu_fw.o \
+       ivpu_fw_log.o \
        ivpu_gem.o \
        ivpu_hw_mtl.o \
        ivpu_ipc.o \
@@ -14,4 +15,4 @@ intel_vpu-y := \
        ivpu_mmu_context.o \
        ivpu_pm.o
 
-obj-$(CONFIG_DRM_ACCEL_IVPU) += intel_vpu.o
\ No newline at end of file
+obj-$(CONFIG_DRM_ACCEL_IVPU) += intel_vpu.o
index df51ec0..a9180fa 100644 (file)
@@ -11,6 +11,8 @@
 
 #include "ivpu_debugfs.h"
 #include "ivpu_drv.h"
+#include "ivpu_fw.h"
+#include "ivpu_fw_log.h"
 #include "ivpu_gem.h"
 #include "ivpu_jsm_msg.h"
 #include "ivpu_pm.h"
@@ -25,6 +27,46 @@ static int bo_list_show(struct seq_file *s, void *v)
        return 0;
 }
 
+static int fw_trace_capability_show(struct seq_file *s, void *v)
+{
+       struct drm_info_node *node = (struct drm_info_node *)s->private;
+       struct ivpu_device *vdev = to_ivpu_device(node->minor->dev);
+       u64 trace_hw_component_mask;
+       u32 trace_destination_mask;
+       int ret;
+
+       ret = ivpu_jsm_trace_get_capability(vdev, &trace_destination_mask,
+                                           &trace_hw_component_mask);
+       if (!ret) {
+               seq_printf(s,
+                          "trace_destination_mask:  %#18x\n"
+                          "trace_hw_component_mask: %#18llx\n",
+                          trace_destination_mask, trace_hw_component_mask);
+       }
+       return 0;
+}
+
+static int fw_trace_config_show(struct seq_file *s, void *v)
+{
+       struct drm_info_node *node = (struct drm_info_node *)s->private;
+       struct ivpu_device *vdev = to_ivpu_device(node->minor->dev);
+       /**
+        * WA: VPU_JSM_MSG_TRACE_GET_CONFIG command is not working yet,
+        * so we use values from vdev->fw instead of calling ivpu_jsm_trace_get_config()
+        */
+       u32 trace_level = vdev->fw->trace_level;
+       u32 trace_destination_mask = vdev->fw->trace_destination_mask;
+       u64 trace_hw_component_mask = vdev->fw->trace_hw_component_mask;
+
+       seq_printf(s,
+                  "trace_level:             %#18x\n"
+                  "trace_destination_mask:  %#18x\n"
+                  "trace_hw_component_mask: %#18llx\n",
+                  trace_level, trace_destination_mask, trace_hw_component_mask);
+
+       return 0;
+}
+
 static int last_bootmode_show(struct seq_file *s, void *v)
 {
        struct drm_info_node *node = (struct drm_info_node *)s->private;
@@ -37,9 +79,127 @@ static int last_bootmode_show(struct seq_file *s, void *v)
 
 static const struct drm_info_list vdev_debugfs_list[] = {
        {"bo_list", bo_list_show, 0},
+       {"fw_trace_capability", fw_trace_capability_show, 0},
+       {"fw_trace_config", fw_trace_config_show, 0},
        {"last_bootmode", last_bootmode_show, 0},
 };
 
+static int fw_log_show(struct seq_file *s, void *v)
+{
+       struct ivpu_device *vdev = s->private;
+       struct drm_printer p = drm_seq_file_printer(s);
+
+       ivpu_fw_log_print(vdev, true, &p);
+       return 0;
+}
+
+static int fw_log_fops_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, fw_log_show, inode->i_private);
+}
+
+static ssize_t
+fw_log_fops_write(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)
+{
+       struct seq_file *s = file->private_data;
+       struct ivpu_device *vdev = s->private;
+
+       if (!size)
+               return -EINVAL;
+
+       ivpu_fw_log_clear(vdev);
+       return size;
+}
+
+static const struct file_operations fw_log_fops = {
+       .owner = THIS_MODULE,
+       .open = fw_log_fops_open,
+       .write = fw_log_fops_write,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
+};
+
+static ssize_t
+fw_trace_destination_mask_fops_write(struct file *file, const char __user *user_buf,
+                                    size_t size, loff_t *pos)
+{
+       struct ivpu_device *vdev = file->private_data;
+       struct ivpu_fw_info *fw = vdev->fw;
+       u32 trace_destination_mask;
+       int ret;
+
+       ret = kstrtou32_from_user(user_buf, size, 0, &trace_destination_mask);
+       if (ret < 0)
+               return ret;
+
+       fw->trace_destination_mask = trace_destination_mask;
+
+       ivpu_jsm_trace_set_config(vdev, fw->trace_level, trace_destination_mask,
+                                 fw->trace_hw_component_mask);
+
+       return size;
+}
+
+static const struct file_operations fw_trace_destination_mask_fops = {
+       .owner = THIS_MODULE,
+       .open = simple_open,
+       .write = fw_trace_destination_mask_fops_write,
+};
+
+static ssize_t
+fw_trace_hw_comp_mask_fops_write(struct file *file, const char __user *user_buf,
+                                size_t size, loff_t *pos)
+{
+       struct ivpu_device *vdev = file->private_data;
+       struct ivpu_fw_info *fw = vdev->fw;
+       u64 trace_hw_component_mask;
+       int ret;
+
+       ret = kstrtou64_from_user(user_buf, size, 0, &trace_hw_component_mask);
+       if (ret < 0)
+               return ret;
+
+       fw->trace_hw_component_mask = trace_hw_component_mask;
+
+       ivpu_jsm_trace_set_config(vdev, fw->trace_level, fw->trace_destination_mask,
+                                 trace_hw_component_mask);
+
+       return size;
+}
+
+static const struct file_operations fw_trace_hw_comp_mask_fops = {
+       .owner = THIS_MODULE,
+       .open = simple_open,
+       .write = fw_trace_hw_comp_mask_fops_write,
+};
+
+static ssize_t
+fw_trace_level_fops_write(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)
+{
+       struct ivpu_device *vdev = file->private_data;
+       struct ivpu_fw_info *fw = vdev->fw;
+       u32 trace_level;
+       int ret;
+
+       ret = kstrtou32_from_user(user_buf, size, 0, &trace_level);
+       if (ret < 0)
+               return ret;
+
+       fw->trace_level = trace_level;
+
+       ivpu_jsm_trace_set_config(vdev, trace_level, fw->trace_destination_mask,
+                                 fw->trace_hw_component_mask);
+
+       return size;
+}
+
+static const struct file_operations fw_trace_level_fops = {
+       .owner = THIS_MODULE,
+       .open = simple_open,
+       .write = fw_trace_level_fops_write,
+};
+
 static ssize_t
 ivpu_reset_engine_fn(struct file *file, const char __user *user_buf, size_t size, loff_t *pos)
 {
@@ -69,6 +229,15 @@ void ivpu_debugfs_init(struct drm_minor *minor)
        drm_debugfs_create_files(vdev_debugfs_list, ARRAY_SIZE(vdev_debugfs_list),
                                 minor->debugfs_root, minor);
 
+       debugfs_create_file("fw_log", 0644, minor->debugfs_root, vdev,
+                           &fw_log_fops);
+       debugfs_create_file("fw_trace_destination_mask", 0200, minor->debugfs_root, vdev,
+                           &fw_trace_destination_mask_fops);
+       debugfs_create_file("fw_trace_hw_comp_mask", 0200, minor->debugfs_root, vdev,
+                           &fw_trace_hw_comp_mask_fops);
+       debugfs_create_file("fw_trace_level", 0200, minor->debugfs_root, vdev,
+                           &fw_trace_level_fops);
+
        debugfs_create_file("reset_engine", 0200, minor->debugfs_root, vdev,
                            &ivpu_reset_engine_fops);
 }
index f58951a..3599bb8 100644 (file)
@@ -11,6 +11,7 @@
 #include "vpu_boot_api.h"
 #include "ivpu_drv.h"
 #include "ivpu_fw.h"
+#include "ivpu_fw_log.h"
 #include "ivpu_gem.h"
 #include "ivpu_hw.h"
 #include "ivpu_ipc.h"
@@ -158,6 +159,10 @@ static int ivpu_fw_parse(struct ivpu_device *vdev)
        fw->cold_boot_entry_point = fw_hdr->entry_point;
        fw->entry_point = fw->cold_boot_entry_point;
 
+       fw->trace_level = min_t(u32, ivpu_log_level, IVPU_FW_LOG_FATAL);
+       fw->trace_destination_mask = VPU_TRACE_DESTINATION_VERBOSE_TRACING;
+       fw->trace_hw_component_mask = -1;
+
        ivpu_dbg(vdev, FW_BOOT, "Size: file %lu image %u runtime %u shavenn %u\n",
                 fw->file->size, fw->image_size, fw->runtime_size, fw->shave_nn_size);
        ivpu_dbg(vdev, FW_BOOT, "Address: runtime 0x%llx, load 0x%llx, entry point 0x%llx\n",
@@ -189,6 +194,7 @@ static int ivpu_fw_update_global_range(struct ivpu_device *vdev)
 static int ivpu_fw_mem_init(struct ivpu_device *vdev)
 {
        struct ivpu_fw_info *fw = vdev->fw;
+       int log_verb_size;
        int ret;
 
        ret = ivpu_fw_update_global_range(vdev);
@@ -201,17 +207,45 @@ static int ivpu_fw_mem_init(struct ivpu_device *vdev)
                return -ENOMEM;
        }
 
+       fw->mem_log_crit = ivpu_bo_alloc_internal(vdev, 0, IVPU_FW_CRITICAL_BUFFER_SIZE,
+                                                 DRM_IVPU_BO_CACHED);
+       if (!fw->mem_log_crit) {
+               ivpu_err(vdev, "Failed to allocate critical log buffer\n");
+               ret = -ENOMEM;
+               goto err_free_fw_mem;
+       }
+
+       if (ivpu_log_level <= IVPU_FW_LOG_INFO)
+               log_verb_size = IVPU_FW_VERBOSE_BUFFER_LARGE_SIZE;
+       else
+               log_verb_size = IVPU_FW_VERBOSE_BUFFER_SMALL_SIZE;
+
+       fw->mem_log_verb = ivpu_bo_alloc_internal(vdev, 0, log_verb_size, DRM_IVPU_BO_CACHED);
+       if (!fw->mem_log_verb) {
+               ivpu_err(vdev, "Failed to allocate verbose log buffer\n");
+               ret = -ENOMEM;
+               goto err_free_log_crit;
+       }
+
        if (fw->shave_nn_size) {
                fw->mem_shave_nn = ivpu_bo_alloc_internal(vdev, vdev->hw->ranges.global_high.start,
                                                          fw->shave_nn_size, DRM_IVPU_BO_UNCACHED);
                if (!fw->mem_shave_nn) {
                        ivpu_err(vdev, "Failed to allocate shavenn buffer\n");
-                       ivpu_bo_free_internal(fw->mem);
-                       return -ENOMEM;
+                       ret = -ENOMEM;
+                       goto err_free_log_verb;
                }
        }
 
        return 0;
+
+err_free_log_verb:
+       ivpu_bo_free_internal(fw->mem_log_verb);
+err_free_log_crit:
+       ivpu_bo_free_internal(fw->mem_log_crit);
+err_free_fw_mem:
+       ivpu_bo_free_internal(fw->mem);
+       return ret;
 }
 
 static void ivpu_fw_mem_fini(struct ivpu_device *vdev)
@@ -223,7 +257,12 @@ static void ivpu_fw_mem_fini(struct ivpu_device *vdev)
                fw->mem_shave_nn = NULL;
        }
 
+       ivpu_bo_free_internal(fw->mem_log_verb);
+       ivpu_bo_free_internal(fw->mem_log_crit);
        ivpu_bo_free_internal(fw->mem);
+
+       fw->mem_log_verb = NULL;
+       fw->mem_log_crit = NULL;
        fw->mem = NULL;
 }
 
@@ -424,6 +463,15 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params
        boot_params->pn_freq_pll_ratio = vdev->hw->pll.pn_ratio;
        boot_params->max_freq_pll_ratio = vdev->hw->pll.max_ratio;
 
+       boot_params->default_trace_level = vdev->fw->trace_level;
+       boot_params->tracing_buff_message_format_mask = BIT(VPU_TRACING_FORMAT_STRING);
+       boot_params->trace_destination_mask = vdev->fw->trace_destination_mask;
+       boot_params->trace_hw_component_mask = vdev->fw->trace_hw_component_mask;
+       boot_params->crit_tracing_buff_addr = vdev->fw->mem_log_crit->vpu_addr;
+       boot_params->crit_tracing_buff_size = vdev->fw->mem_log_crit->base.size;
+       boot_params->verbose_tracing_buff_addr = vdev->fw->mem_log_verb->vpu_addr;
+       boot_params->verbose_tracing_buff_size = vdev->fw->mem_log_verb->base.size;
+
        boot_params->punit_telemetry_sram_base = ivpu_hw_reg_telemetry_offset_get(vdev);
        boot_params->punit_telemetry_sram_size = ivpu_hw_reg_telemetry_size_get(vdev);
        boot_params->vpu_telemetry_enable = ivpu_hw_reg_telemetry_enable_get(vdev);
index 8d275c8..3cc3a14 100644 (file)
@@ -23,6 +23,9 @@ struct ivpu_fw_info {
        u32 shave_nn_size;
        u64 entry_point; /* Cold or warm boot entry point for next boot */
        u64 cold_boot_entry_point;
+       u32 trace_level;
+       u32 trace_destination_mask;
+       u64 trace_hw_component_mask;
 };
 
 int ivpu_fw_init(struct ivpu_device *vdev);
diff --git a/drivers/accel/ivpu/ivpu_fw_log.c b/drivers/accel/ivpu/ivpu_fw_log.c
new file mode 100644 (file)
index 0000000..95065ca
--- /dev/null
@@ -0,0 +1,142 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2020-2023 Intel Corporation
+ */
+
+#include <linux/ctype.h>
+#include <linux/highmem.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
+#include <linux/moduleparam.h>
+
+#include "vpu_boot_api.h"
+#include "ivpu_drv.h"
+#include "ivpu_fw.h"
+#include "ivpu_fw_log.h"
+#include "ivpu_gem.h"
+
+#define IVPU_FW_LOG_LINE_LENGTH          256
+
+unsigned int ivpu_log_level = IVPU_FW_LOG_ERROR;
+module_param(ivpu_log_level, uint, 0444);
+MODULE_PARM_DESC(ivpu_log_level,
+                "VPU firmware default trace level: debug=" __stringify(IVPU_FW_LOG_DEBUG)
+                " info=" __stringify(IVPU_FW_LOG_INFO)
+                " warn=" __stringify(IVPU_FW_LOG_WARN)
+                " error=" __stringify(IVPU_FW_LOG_ERROR)
+                " fatal=" __stringify(IVPU_FW_LOG_FATAL));
+
+static int fw_log_ptr(struct ivpu_device *vdev, struct ivpu_bo *bo, u32 *offset,
+                     struct vpu_tracing_buffer_header **log_header)
+{
+       struct vpu_tracing_buffer_header *log;
+
+       if ((*offset + sizeof(*log)) > bo->base.size)
+               return -EINVAL;
+
+       log = bo->kvaddr + *offset;
+
+       if (log->vpu_canary_start != VPU_TRACING_BUFFER_CANARY)
+               return -EINVAL;
+
+       if (log->header_size < sizeof(*log) || log->header_size > 1024) {
+               ivpu_dbg(vdev, FW_BOOT, "Invalid header size 0x%x\n", log->header_size);
+               return -EINVAL;
+       }
+       if ((char *)log + log->size > (char *)bo->kvaddr + bo->base.size) {
+               ivpu_dbg(vdev, FW_BOOT, "Invalid log size 0x%x\n", log->size);
+               return -EINVAL;
+       }
+
+       *log_header = log;
+       *offset += log->size;
+
+       ivpu_dbg(vdev, FW_BOOT,
+                "FW log name \"%s\", write offset 0x%x size 0x%x, wrap count %d, hdr version %d size %d format %d, alignment %d",
+                log->name, log->write_index, log->size, log->wrap_count, log->header_version,
+                log->header_size, log->format, log->alignment);
+
+       return 0;
+}
+
+static void buffer_print(char *buffer, u32 size, struct drm_printer *p)
+{
+       char line[IVPU_FW_LOG_LINE_LENGTH];
+       u32 index = 0;
+
+       if (!size || !buffer)
+               return;
+
+       while (size--) {
+               if (*buffer == '\n' || *buffer == 0) {
+                       line[index] = 0;
+                       if (index != 0)
+                               drm_printf(p, "%s\n", line);
+                       index = 0;
+                       buffer++;
+                       continue;
+               }
+               if (index == IVPU_FW_LOG_LINE_LENGTH - 1) {
+                       line[index] = 0;
+                       index = 0;
+                       drm_printf(p, "%s\n", line);
+               }
+               if (*buffer != '\r' && (isprint(*buffer) || iscntrl(*buffer)))
+                       line[index++] = *buffer;
+               buffer++;
+       }
+       line[index] = 0;
+       if (index != 0)
+               drm_printf(p, "%s\n", line);
+}
+
+static void fw_log_print_buffer(struct ivpu_device *vdev, struct vpu_tracing_buffer_header *log,
+                               const char *prefix, bool only_new_msgs, struct drm_printer *p)
+{
+       char *log_buffer = (void *)log + log->header_size;
+       u32 log_size = log->size - log->header_size;
+       u32 log_start = log->read_index;
+       u32 log_end = log->write_index;
+
+       if (!(log->write_index || log->wrap_count) ||
+           (log->write_index == log->read_index && only_new_msgs)) {
+               drm_printf(p, "==== %s \"%s\" log empty ====\n", prefix, log->name);
+               return;
+       }
+
+       drm_printf(p, "==== %s \"%s\" log start ====\n", prefix, log->name);
+       if (log->write_index > log->read_index) {
+               buffer_print(log_buffer + log_start, log_end - log_start, p);
+       } else {
+               buffer_print(log_buffer + log_end, log_size - log_end, p);
+               buffer_print(log_buffer, log_end, p);
+       }
+       drm_printf(p, "\x1b[0m");
+       drm_printf(p, "==== %s \"%s\" log end   ====\n", prefix, log->name);
+}
+
+void ivpu_fw_log_print(struct ivpu_device *vdev, bool only_new_msgs, struct drm_printer *p)
+{
+       struct vpu_tracing_buffer_header *log_header;
+       u32 next = 0;
+
+       while (fw_log_ptr(vdev, vdev->fw->mem_log_crit, &next, &log_header) == 0)
+               fw_log_print_buffer(vdev, log_header, "VPU critical", only_new_msgs, p);
+
+       next = 0;
+       while (fw_log_ptr(vdev, vdev->fw->mem_log_verb, &next, &log_header) == 0)
+               fw_log_print_buffer(vdev, log_header, "VPU verbose", only_new_msgs, p);
+}
+
+void ivpu_fw_log_clear(struct ivpu_device *vdev)
+{
+       struct vpu_tracing_buffer_header *log_header;
+       u32 next = 0;
+
+       while (fw_log_ptr(vdev, vdev->fw->mem_log_crit, &next, &log_header) == 0)
+               log_header->read_index = log_header->write_index;
+
+       next = 0;
+       while (fw_log_ptr(vdev, vdev->fw->mem_log_verb, &next, &log_header) == 0)
+               log_header->read_index = log_header->write_index;
+}
diff --git a/drivers/accel/ivpu/ivpu_fw_log.h b/drivers/accel/ivpu/ivpu_fw_log.h
new file mode 100644 (file)
index 0000000..0b2573f
--- /dev/null
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2020-2023 Intel Corporation
+ */
+
+#ifndef __IVPU_FW_LOG_H__
+#define __IVPU_FW_LOG_H__
+
+#include <linux/types.h>
+
+#include <drm/drm_print.h>
+
+#include "ivpu_drv.h"
+
+#define IVPU_FW_LOG_DEFAULT 0
+#define IVPU_FW_LOG_DEBUG   1
+#define IVPU_FW_LOG_INFO    2
+#define IVPU_FW_LOG_WARN    3
+#define IVPU_FW_LOG_ERROR   4
+#define IVPU_FW_LOG_FATAL   5
+
+extern unsigned int ivpu_log_level;
+
+#define IVPU_FW_VERBOSE_BUFFER_SMALL_SIZE      SZ_1M
+#define IVPU_FW_VERBOSE_BUFFER_LARGE_SIZE      SZ_8M
+#define IVPU_FW_CRITICAL_BUFFER_SIZE           SZ_512K
+
+void ivpu_fw_log_print(struct ivpu_device *vdev, bool only_new_msgs, struct drm_printer *p);
+void ivpu_fw_log_clear(struct ivpu_device *vdev);
+
+static inline void ivpu_fw_log_dump(struct ivpu_device *vdev)
+{
+       struct drm_printer p = drm_info_printer(vdev->drm.dev);
+
+       ivpu_fw_log_print(vdev, false, &p);
+}
+
+#endif /* __IVPU_FW_LOG_H__ */