tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

accel/ivpu: Rename ivpu_log_level to fw_log_level

Browse Source 
commit 3a3fb8110c65d361cd9d750c9e16520f740c93f2 upstream.

Rename module param ivpu_log_level to fw_log_level, so it is clear
what log level is actually changed.

Reviewed-by: Maciej Falkowski <maciej.falkowski@linux.intel.com>
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930195322.461209-3-jacek.lawrynowicz@linux.intel.com
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jacek Lawrynowicz
2024-09-30 21:52:53 +02:00
committed by Greg Kroah-Hartman
parent 74953f93f4
commit 1c302f64ea
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/accel/ivpu/ivpu_fw.c
+2 -2
View File
@@ -218,7 +218,7 @@ static int ivpu_fw_parse(struct ivpu_device *vdev)
fw->cold_boot_entry_point = fw_hdr->entry_point; fw->cold_boot_entry_point = fw_hdr->entry_point;
fw->entry_point = fw->cold_boot_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_level = min_t(u32, ivpu_fw_log_level, IVPU_FW_LOG_FATAL);
fw->trace_destination_mask = VPU_TRACE_DESTINATION_VERBOSE_TRACING; fw->trace_destination_mask = VPU_TRACE_DESTINATION_VERBOSE_TRACING;
fw->trace_hw_component_mask = -1; fw->trace_hw_component_mask = -1;
@@ -323,7 +323,7 @@ static int ivpu_fw_mem_init(struct ivpu_device *vdev)
goto err_free_fw_mem; goto err_free_fw_mem;
} }
if (ivpu_log_level <= IVPU_FW_LOG_INFO) if (ivpu_fw_log_level <= IVPU_FW_LOG_INFO)
log_verb_size = IVPU_FW_VERBOSE_BUFFER_LARGE_SIZE; log_verb_size = IVPU_FW_VERBOSE_BUFFER_LARGE_SIZE;
else else
log_verb_size = IVPU_FW_VERBOSE_BUFFER_SMALL_SIZE; log_verb_size = IVPU_FW_VERBOSE_BUFFER_SMALL_SIZE;
drivers/accel/ivpu/ivpu_fw_log.c
+6 -6
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (C) 2020-2023 Intel Corporation * Copyright (C) 2020-2024 Intel Corporation
*/ */
#include <linux/ctype.h> #include <linux/ctype.h>
@@ -15,12 +15,12 @@
#include "ivpu_fw_log.h" #include "ivpu_fw_log.h"
#include "ivpu_gem.h" #include "ivpu_gem.h"
#define IVPU_FW_LOG_LINE_LENGTH 256 #define IVPU_FW_LOG_LINE_LENGTH 256
unsigned int ivpu_log_level = IVPU_FW_LOG_ERROR; unsigned int ivpu_fw_log_level = IVPU_FW_LOG_ERROR;
module_param(ivpu_log_level, uint, 0444); module_param_named(fw_log_level, ivpu_fw_log_level, uint, 0444);
MODULE_PARM_DESC(ivpu_log_level, MODULE_PARM_DESC(fw_log_level,
"NPU firmware default trace level: debug=" __stringify(IVPU_FW_LOG_DEBUG) "NPU firmware default log level: debug=" __stringify(IVPU_FW_LOG_DEBUG)
" info=" __stringify(IVPU_FW_LOG_INFO) " info=" __stringify(IVPU_FW_LOG_INFO)
" warn=" __stringify(IVPU_FW_LOG_WARN) " warn=" __stringify(IVPU_FW_LOG_WARN)
" error=" __stringify(IVPU_FW_LOG_ERROR) " error=" __stringify(IVPU_FW_LOG_ERROR)
drivers/accel/ivpu/ivpu_fw_log.h
+3 -3
View File
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (C) 2020-2023 Intel Corporation * Copyright (C) 2020-2024 Intel Corporation
*/ */
#ifndef __IVPU_FW_LOG_H__ #ifndef __IVPU_FW_LOG_H__
@@ -17,12 +17,12 @@
#define IVPU_FW_LOG_ERROR 4 #define IVPU_FW_LOG_ERROR 4
#define IVPU_FW_LOG_FATAL 5 #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_SMALL_SIZE SZ_1M
#define IVPU_FW_VERBOSE_BUFFER_LARGE_SIZE SZ_8M #define IVPU_FW_VERBOSE_BUFFER_LARGE_SIZE SZ_8M
#define IVPU_FW_CRITICAL_BUFFER_SIZE SZ_512K #define IVPU_FW_CRITICAL_BUFFER_SIZE SZ_512K
extern unsigned int ivpu_fw_log_level;
void ivpu_fw_log_print(struct ivpu_device *vdev, bool only_new_msgs, struct drm_printer *p); 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); void ivpu_fw_log_clear(struct ivpu_device *vdev);