Skip to content

Commit d16d8c4

Browse files
lyakhlgirdwood
lyakh
authored and
lgirdwood
committed
lib_manager: clean up logging
With Zephyr function names are included in log messages, no need to supply them in the format string. Also reduce verbosity of lib_manager_module_create() - it's called every time a loadable module is instantiated, no need to log this fact. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent dbdfe32 commit d16d8c4

2 files changed

Lines changed: 30 additions & 52 deletions

File tree

‎src/library_manager/lib_manager.c‎

Lines changed: 29 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static int lib_manager_auth_init(void)
7676
ret = auth_api_init(&ext_lib->auth_ctx, ext_lib->auth_buffer,
7777
AUTH_SCRATCH_BUFF_SZ, IMG_TYPE_LIB);
7878
if (ret != 0) {
79-
tr_err(&lib_manager_tr, "lib_manager_auth_init() failed with error: %d", ret);
79+
tr_err(&lib_manager_tr, "auth_api_init() failed with error: %d", ret);
8080
rfree(ext_lib->auth_buffer);
8181
ret = -EACCES;
8282
}
@@ -105,7 +105,7 @@ static int lib_manager_auth_proc(const void *buffer_data,
105105
ret = auth_api_init_auth_proc(&ext_lib->auth_ctx, buffer_data, buffer_size, phase);
106106

107107
if (ret != 0) {
108-
tr_err(&lib_manager_tr, "lib_manager_auth_proc() failed with error: %d", ret);
108+
tr_err(&lib_manager_tr, "auth_api_init_auth_proc() failed with error: %d", ret);
109109
return -ENOTSUP;
110110
}
111111

@@ -116,7 +116,7 @@ static int lib_manager_auth_proc(const void *buffer_data,
116116
ret = auth_api_result(&ext_lib->auth_ctx);
117117

118118
if (ret != AUTH_IMAGE_TRUSTED) {
119-
tr_err(&lib_manager_tr, "lib_manager_auth_proc() Untrasted library!");
119+
tr_err(&lib_manager_tr, "Untrusted library!");
120120
return -EACCES;
121121
}
122122

@@ -291,8 +291,7 @@ static void __sparse_cache *lib_manager_get_instance_bss_address(uint32_t module
291291
(void __sparse_cache *)(mod->segment[SOF_MAN_SEGMENT_BSS].v_base_addr +
292292
inst_offset);
293293

294-
tr_dbg(&lib_manager_tr,
295-
"lib_manager_get_instance_bss_address(): instance_bss_size: %#x, pointer: %p",
294+
tr_dbg(&lib_manager_tr, "instance_bss_size: %#x, pointer: %p",
296295
instance_bss_size, (__sparse_force void *)va_base);
297296

298297
return va_base;
@@ -308,8 +307,7 @@ static int lib_manager_allocate_module_instance(uint32_t module_id, uint32_t ins
308307
instance_id, mod);
309308

310309
if ((is_pages * PAGE_SZ) > bss_size) {
311-
tr_err(&lib_manager_tr,
312-
"lib_manager_allocate_module_instance(): invalid is_pages: %u, required: %u",
310+
tr_err(&lib_manager_tr, "invalid is_pages: %u, required: %u",
313311
is_pages, bss_size / PAGE_SZ);
314312
return -ENOMEM;
315313
}
@@ -349,13 +347,11 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
349347
int ret;
350348
uint32_t module_id = IPC4_MOD_ID(ipc_config->id);
351349

352-
tr_dbg(&lib_manager_tr, "lib_manager_allocate_module(): mod_id: %#x",
353-
ipc_config->id);
350+
tr_dbg(&lib_manager_tr, "mod_id: %#x", ipc_config->id);
354351

355352
mod = lib_manager_get_module_manifest(module_id);
356353
if (!mod) {
357-
tr_err(&lib_manager_tr,
358-
"lib_manager_allocate_module(): failed to get module descriptor");
354+
tr_err(&lib_manager_tr, "failed to get module descriptor");
359355
return 0;
360356
}
361357

@@ -375,8 +371,7 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
375371
ret = lib_manager_allocate_module_instance(module_id, IPC4_INST_ID(ipc_config->id),
376372
base_cfg->is_pages, mod);
377373
if (ret < 0) {
378-
tr_err(&lib_manager_tr,
379-
"lib_manager_allocate_module(): module allocation failed: %d", ret);
374+
tr_err(&lib_manager_tr, "module allocation failed: %d", ret);
380375
#ifdef CONFIG_LIBCODE_MODULE_SUPPORT
381376
lib_manager_unload_libcode_modules(module_id);
382377
#endif /* CONFIG_LIBCODE_MODULE_SUPPORT */
@@ -395,7 +390,7 @@ int lib_manager_free_module(const uint32_t component_id)
395390
const uint32_t module_id = IPC4_MOD_ID(component_id);
396391
int ret;
397392

398-
tr_dbg(&lib_manager_tr, "lib_manager_free_module(): mod_id: %#x", component_id);
393+
tr_dbg(&lib_manager_tr, "mod_id: %#x", component_id);
399394

400395
mod = lib_manager_get_module_manifest(module_id);
401396

@@ -414,8 +409,7 @@ int lib_manager_free_module(const uint32_t component_id)
414409

415410
ret = lib_manager_free_module_instance(module_id, IPC4_INST_ID(component_id), mod);
416411
if (ret < 0) {
417-
tr_err(&lib_manager_tr,
418-
"lib_manager_free_module(): free module instance failed: %d", ret);
412+
tr_err(&lib_manager_tr, "free module instance failed: %d", ret);
419413
return ret;
420414
}
421415
return 0;
@@ -429,16 +423,14 @@ uintptr_t lib_manager_allocate_module(struct processing_module *proc,
429423
const struct comp_ipc_config *ipc_config,
430424
const void *ipc_specific_config, const void **buildinfo)
431425
{
432-
tr_err(&lib_manager_tr,
433-
"lib_manager_allocate_module(): Dynamic module allocation is not supported");
426+
tr_err(&lib_manager_tr, "Dynamic module allocation is not supported");
434427
return 0;
435428
}
436429

437430
int lib_manager_free_module(const uint32_t component_id)
438431
{
439432
/* Since we cannot allocate the freeing is not considered to be an error */
440-
tr_warn(&lib_manager_tr,
441-
"lib_manager_free_module(): Dynamic module freeing is not supported");
433+
tr_warn(&lib_manager_tr, "Dynamic module freeing is not supported");
442434
return 0;
443435
}
444436
#endif /* CONFIG_MM_DRV */
@@ -527,11 +519,10 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
527519
args->data);
528520

529521
if (!module_entry_point) {
530-
tr_err(&lib_manager_tr,
531-
"lib_manager_module_create(), lib_manager_allocate_module() failed!");
522+
tr_err(&lib_manager_tr, "lib_manager_allocate_module() failed!");
532523
return NULL;
533524
}
534-
tr_info(&lib_manager_tr, "lib_manager_module_create() start");
525+
tr_dbg(&lib_manager_tr, "start");
535526

536527
mod_cfg.data = (uint8_t *)args->data;
537528
/* Intel modules expects DW size here */
@@ -544,8 +535,7 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
544535

545536
if (!drv->adapter_ops) {
546537
lib_manager_free_module(module_id);
547-
tr_err(&lib_manager_tr,
548-
"lib_manager_module_create(), native_system_agent_start failed!");
538+
tr_err(&lib_manager_tr, "native_system_agent_start failed!");
549539
return NULL;
550540
}
551541

@@ -575,7 +565,7 @@ static void lib_manager_module_free(struct comp_dev *dev)
575565
/* Free module resources allocated in L2 memory. */
576566
ret = lib_manager_free_module(module_id);
577567
if (ret < 0)
578-
comp_err(dev, "modules_free(), lib_manager_free_module() failed!");
568+
comp_err(dev, "lib_manager_free_module() failed!");
579569
}
580570
}
581571

@@ -636,8 +626,7 @@ int lib_manager_register_module(const uint32_t component_id)
636626
sizeof(struct comp_driver_info));
637627

638628
if (!new_drv_info) {
639-
tr_err(&lib_manager_tr,
640-
"lib_manager_register_module(): failed to allocate comp_driver_info");
629+
tr_err(&lib_manager_tr, "failed to allocate comp_driver_info");
641630
ret = -ENOMEM;
642631
goto cleanup;
643632
}
@@ -646,8 +635,7 @@ int lib_manager_register_module(const uint32_t component_id)
646635
SOF_MEM_CAPS_RAM | SOF_MEM_FLAG_COHERENT,
647636
sizeof(struct comp_driver));
648637
if (!drv) {
649-
tr_err(&lib_manager_tr,
650-
"lib_manager_register_module(): failed to allocate comp_driver");
638+
tr_err(&lib_manager_tr, "failed to allocate comp_driver");
651639
ret = -ENOMEM;
652640
goto cleanup;
653641
}
@@ -665,8 +653,7 @@ int lib_manager_register_module(const uint32_t component_id)
665653
SOF_MAN_ELF_TEXT_OFFSET +
666654
mod->segment[SOF_MAN_SEGMENT_TEXT].file_offset);
667655

668-
tr_info(&lib_manager_tr,
669-
"lib_manager_register_module(): Module API version: %u.%u.%u, format: 0x%x",
656+
tr_info(&lib_manager_tr, "Module API version: %u.%u.%u, format: 0x%x",
670657
build_info->api_version_number.fields.major,
671658
build_info->api_version_number.fields.middle,
672659
build_info->api_version_number.fields.minor,
@@ -682,8 +669,7 @@ int lib_manager_register_module(const uint32_t component_id)
682669
/* Check if module is NOT native */
683670
if (build_info->format != SOF_MODULE_API_BUILD_INFO_FORMAT ||
684671
build_info->api_version_number.full != SOF_MODULE_API_CURRENT_VERSION) {
685-
tr_err(&lib_manager_tr,
686-
"lib_manager_register_module(): Unsupported module API version");
672+
tr_err(&lib_manager_tr, "Unsupported module API version");
687673
return -ENOEXEC;
688674
}
689675
}
@@ -707,8 +693,7 @@ int lib_manager_register_module(const uint32_t component_id)
707693
#else /* CONFIG_INTEL_MODULES */
708694
int lib_manager_register_module(const uint32_t component_id)
709695
{
710-
tr_err(&lib_manager_tr,
711-
"lib_manager_register_module(): Dynamic module loading is not supported");
696+
tr_err(&lib_manager_tr, "Dynamic module loading is not supported");
712697
return -ENOTSUP;
713698
}
714699
#endif /* CONFIG_INTEL_MODULES */
@@ -723,13 +708,11 @@ static int lib_manager_dma_buffer_alloc(struct lib_manager_dma_ext *dma_ext,
723708
dma_ext->dma_addr = (uintptr_t)rballoc_align(SOF_MEM_FLAG_COHERENT, SOF_MEM_CAPS_DMA, size,
724709
dma_ext->addr_align);
725710
if (!dma_ext->dma_addr) {
726-
tr_err(&lib_manager_tr, "lib_manager_dma_buffer_alloc(): alloc failed");
711+
tr_err(&lib_manager_tr, "alloc failed");
727712
return -ENOMEM;
728713
}
729714

730-
tr_dbg(&lib_manager_tr,
731-
"lib_manager_dma_buffer_alloc(): address: %#lx, size: %u",
732-
dma_ext->dma_addr, size);
715+
tr_dbg(&lib_manager_tr, "address: %#lx, size: %u", dma_ext->dma_addr, size);
733716

734717
return 0;
735718
}
@@ -749,8 +732,7 @@ static int lib_manager_dma_init(struct lib_manager_dma_ext *dma_ext, uint32_t dm
749732
dma_ext->dma = sof_dma_get(SOF_DMA_DIR_HMEM_TO_LMEM, 0, SOF_DMA_DEV_HOST,
750733
SOF_DMA_ACCESS_EXCLUSIVE);
751734
if (!dma_ext->dma) {
752-
tr_err(&lib_manager_tr,
753-
"lib_manager_dma_init(): dma_ext->dma = NULL");
735+
tr_err(&lib_manager_tr, "dma_ext->dma = NULL");
754736
return -ENODEV;
755737
}
756738

@@ -800,8 +782,7 @@ static int lib_manager_load_data_from_host(struct lib_manager_dma_ext *dma_ext,
800782
k_usleep(100);
801783
}
802784

803-
tr_err(&lib_manager_tr,
804-
"lib_manager_load_data_from_host(): timeout during DMA transfer");
785+
tr_err(&lib_manager_tr, "timeout during DMA transfer");
805786
return -ETIMEDOUT;
806787
}
807788

@@ -847,7 +828,7 @@ static void __sparse_cache *lib_manager_allocate_store_mem(uint32_t size,
847828
local_add = (__sparse_force void __sparse_cache *)rballoc_align(0, caps, size, addr_align);
848829

849830
if (!local_add) {
850-
tr_err(&lib_manager_tr, "lib_manager_allocate_store_mem(): alloc failed");
831+
tr_err(&lib_manager_tr, "alloc failed");
851832
return NULL;
852833
}
853834

@@ -882,8 +863,7 @@ static int lib_manager_store_library(struct lib_manager_dma_ext *dma_ext,
882863
if (!library_base_address)
883864
return -ENOMEM;
884865

885-
tr_dbg(&lib_manager_tr, "lib_manager_store_library(): pointer: %p",
886-
(__sparse_force void *)library_base_address);
866+
tr_dbg(&lib_manager_tr, "pointer: %p", (__sparse_force void *)library_base_address);
887867

888868
#if CONFIG_LIBRARY_AUTH_SUPPORT
889869
/* AUTH_PHASE_FIRST - checks library manifest only. */
@@ -1007,8 +987,7 @@ int lib_manager_load_library(uint32_t dma_id, uint32_t lib_id, uint32_t type)
1007987

1008988
if (type == SOF_IPC4_GLB_LOAD_LIBRARY &&
1009989
(lib_id == 0 || lib_id >= LIB_MANAGER_MAX_LIBS)) {
1010-
tr_err(&lib_manager_tr,
1011-
"lib_manager_load_library(): invalid lib_id: %u", lib_id);
990+
tr_err(&lib_manager_tr, "invalid lib_id: %u", lib_id);
1012991
return -EINVAL;
1013992
}
1014993

@@ -1057,8 +1036,7 @@ int lib_manager_load_library(uint32_t dma_id, uint32_t lib_id, uint32_t type)
10571036
stop_dma:
10581037
ret2 = dma_stop(dma_ext->chan->dma->z_dev, dma_ext->chan->index);
10591038
if (ret2 < 0) {
1060-
tr_err(&lib_manager_tr,
1061-
"lib_manager_load_library(): error stopping DMA: %d", ret);
1039+
tr_err(&lib_manager_tr, "error stopping DMA: %d", ret);
10621040
if (!ret)
10631041
ret = ret2;
10641042
}

‎src/library_manager/lib_notification.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct ipc_msg *lib_notif_msg_init(uint32_t header, uint32_t size)
4444
k_spinlock_key_t key;
4545
/* No free element or list empty, create new handle */
4646
if (ext_lib->lib_notif_count > LIB_MANAGER_LIB_NOTIX_MAX_COUNT) {
47-
tr_dbg(&lib_manager_tr, "lib_nofig_msg_init() LIB_MANAGER_LIB_NOTIX_MAX_COUNT < %d",
47+
tr_dbg(&lib_manager_tr, "LIB_MANAGER_LIB_NOTIX_MAX_COUNT < %d",
4848
ext_lib->lib_notif_count);
4949
return NULL;
5050
}

0 commit comments

Comments
 (0)