Skip to content

Commit 1c302f6

Browse files
jlawrynogregkh
authored andcommitted
accel/ivpu: Rename ivpu_log_level to fw_log_level
commit 3a3fb81 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 <[email protected]> Reviewed-by: Jeffrey Hugo <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Jacek Lawrynowicz <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 74953f9 commit 1c302f6

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

drivers/accel/ivpu/ivpu_fw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static int ivpu_fw_parse(struct ivpu_device *vdev)
218218
fw->cold_boot_entry_point = fw_hdr->entry_point;
219219
fw->entry_point = fw->cold_boot_entry_point;
220220

221-
fw->trace_level = min_t(u32, ivpu_log_level, IVPU_FW_LOG_FATAL);
221+
fw->trace_level = min_t(u32, ivpu_fw_log_level, IVPU_FW_LOG_FATAL);
222222
fw->trace_destination_mask = VPU_TRACE_DESTINATION_VERBOSE_TRACING;
223223
fw->trace_hw_component_mask = -1;
224224

@@ -323,7 +323,7 @@ static int ivpu_fw_mem_init(struct ivpu_device *vdev)
323323
goto err_free_fw_mem;
324324
}
325325

326-
if (ivpu_log_level <= IVPU_FW_LOG_INFO)
326+
if (ivpu_fw_log_level <= IVPU_FW_LOG_INFO)
327327
log_verb_size = IVPU_FW_VERBOSE_BUFFER_LARGE_SIZE;
328328
else
329329
log_verb_size = IVPU_FW_VERBOSE_BUFFER_SMALL_SIZE;

drivers/accel/ivpu/ivpu_fw_log.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/*
3-
* Copyright (C) 2020-2023 Intel Corporation
3+
* Copyright (C) 2020-2024 Intel Corporation
44
*/
55

66
#include <linux/ctype.h>
@@ -15,12 +15,12 @@
1515
#include "ivpu_fw_log.h"
1616
#include "ivpu_gem.h"
1717

18-
#define IVPU_FW_LOG_LINE_LENGTH 256
18+
#define IVPU_FW_LOG_LINE_LENGTH 256
1919

20-
unsigned int ivpu_log_level = IVPU_FW_LOG_ERROR;
21-
module_param(ivpu_log_level, uint, 0444);
22-
MODULE_PARM_DESC(ivpu_log_level,
23-
"NPU firmware default trace level: debug=" __stringify(IVPU_FW_LOG_DEBUG)
20+
unsigned int ivpu_fw_log_level = IVPU_FW_LOG_ERROR;
21+
module_param_named(fw_log_level, ivpu_fw_log_level, uint, 0444);
22+
MODULE_PARM_DESC(fw_log_level,
23+
"NPU firmware default log level: debug=" __stringify(IVPU_FW_LOG_DEBUG)
2424
" info=" __stringify(IVPU_FW_LOG_INFO)
2525
" warn=" __stringify(IVPU_FW_LOG_WARN)
2626
" error=" __stringify(IVPU_FW_LOG_ERROR)

drivers/accel/ivpu/ivpu_fw_log.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0-only */
22
/*
3-
* Copyright (C) 2020-2023 Intel Corporation
3+
* Copyright (C) 2020-2024 Intel Corporation
44
*/
55

66
#ifndef __IVPU_FW_LOG_H__
@@ -17,12 +17,12 @@
1717
#define IVPU_FW_LOG_ERROR 4
1818
#define IVPU_FW_LOG_FATAL 5
1919

20-
extern unsigned int ivpu_log_level;
21-
2220
#define IVPU_FW_VERBOSE_BUFFER_SMALL_SIZE SZ_1M
2321
#define IVPU_FW_VERBOSE_BUFFER_LARGE_SIZE SZ_8M
2422
#define IVPU_FW_CRITICAL_BUFFER_SIZE SZ_512K
2523

24+
extern unsigned int ivpu_fw_log_level;
25+
2626
void ivpu_fw_log_print(struct ivpu_device *vdev, bool only_new_msgs, struct drm_printer *p);
2727
void ivpu_fw_log_clear(struct ivpu_device *vdev);
2828

0 commit comments

Comments
 (0)