Skip to content

Commit 7f80efa

Browse files
committed
debug
1 parent 342fd7b commit 7f80efa

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

src/audio/module_adapter/library/userspace_proxy.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static int userspace_proxy_memory_init(struct userspace_context *user_ctx,
294294
POINTER_TO_UINT(heap->init_mem),
295295
heap->init_bytes, CONFIG_MM_DRV_PAGE_SIZE);
296296

297-
tr_dbg(&userspace_proxy_tr, "Heap partition %#lx + %zx, attr = %u",
297+
tr_err(&userspace_proxy_tr, "Heap partition %#lx + %zx, attr = %u",
298298
heap_part.start, heap_part.size, heap_part.attr);
299299

300300
#if !defined(CONFIG_XTENSA_MMU_DOUBLE_MAP) && defined(CONFIG_SOF_ZEPHYR_HEAP_CACHED)
@@ -308,7 +308,7 @@ static int userspace_proxy_memory_init(struct userspace_context *user_ctx,
308308
POINTER_TO_UINT(sys_cache_cached_ptr_get(heap->init_mem)),
309309
heap->init_bytes, CONFIG_MM_DRV_PAGE_SIZE);
310310

311-
tr_dbg(&userspace_proxy_tr, "Cached heap partition %#lx + %zx, attr = %u",
311+
tr_err(&userspace_proxy_tr, "Cached heap partition %#lx + %zx, attr = %u",
312312
heap_cached_part.start, heap_cached_part.size, heap_cached_part.attr);
313313
#endif
314314

@@ -323,7 +323,7 @@ static int userspace_proxy_memory_init(struct userspace_context *user_ctx,
323323
&heap_part
324324
};
325325

326-
tr_dbg(&userspace_proxy_tr, "Common partition %#lx + %zx, attr = %u",
326+
tr_err(&userspace_proxy_tr, "Common partition %#lx + %zx, attr = %u",
327327
common_partition.start, common_partition.size, common_partition.attr);
328328

329329
return k_mem_domain_init(user_ctx->comp_dom, ARRAY_SIZE(parts_ptr), parts_ptr);
@@ -413,7 +413,7 @@ int userspace_proxy_create(struct userspace_context **user_ctx, const struct com
413413
struct k_mem_domain *domain;
414414
int ret;
415415

416-
tr_err(&userspace_proxy_tr, "userspace create");
416+
tr_err(&userspace_proxy_tr, "userspace create, user heap %p, init_mem %p", (void *)drv->user_heap, drv->user_heap->heap.init_mem);
417417

418418
context = k_heap_alloc(drv->user_heap, sizeof(struct userspace_context), K_FOREVER);
419419
if (!context)
@@ -487,6 +487,7 @@ void userspace_proxy_destroy(const struct comp_driver *drv, struct userspace_con
487487
rfree(user_ctx->comp_dom);
488488
k_heap_free(drv->user_heap, user_ctx);
489489
}
490+
struct processing_module *debug_mod;
490491

491492
/**
492493
* Copy parameters to user worker accessible space.
@@ -498,9 +499,14 @@ void userspace_proxy_destroy(const struct comp_driver *drv, struct userspace_con
498499
*/
499500
static int userspace_proxy_init(struct processing_module *mod)
500501
{
502+
debug_mod = mod;
501503
struct module_params *params = user_work_get_params(mod->user_ctx);
502504
DEBUG(mod);
503505
int ret;
506+
tr_err(&userspace_proxy_tr, "resource k_heap %p, z_heap %p, init %p",
507+
(void*)mod->priv.resources.heap,
508+
(void*)mod->priv.resources.heap->heap.heap,
509+
(void*)mod->priv.resources.heap->heap.init_mem);
504510

505511
comp_dbg(mod->dev, "start");
506512
DEBUG(mod);

src/library_manager/llext_manager.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ static int llext_manager_add_partition(struct k_mem_domain *domain,
737737
.attr = attr,
738738
};
739739

740-
tr_dbg(&lib_manager_tr, "add %#zx @ %lx partition", part.size, part.start);
740+
tr_err(&lib_manager_tr, "add %#zx @ %lx partition", part.size, part.start);
741741
return k_mem_domain_add_partition(domain, &part);
742742
}
743743

@@ -752,7 +752,7 @@ static int llext_manager_rm_partition(struct k_mem_domain *domain,
752752
.attr = attr,
753753
};
754754

755-
tr_dbg(&lib_manager_tr, "remove %#zx @ %lx partition", part.size, part.start);
755+
tr_err(&lib_manager_tr, "remove %#zx @ %lx partition", part.size, part.start);
756756
return k_mem_domain_remove_partition(domain, &part);
757757
}
758758

@@ -778,20 +778,26 @@ int llext_manager_add_domain(const uint32_t component_id, struct k_mem_domain *d
778778
uintptr_t va_base_data = mctx->segment[LIB_MANAGER_DATA].addr;
779779
size_t data_size = mctx->segment[LIB_MANAGER_DATA].size;
780780

781+
tr_err(&lib_manager_tr, ".text %#x @ %#lx",
782+
text_size, (uintptr_t)va_base_text);
781783
int ret = llext_manager_add_partition(domain, va_base_text, text_size,
782784
K_MEM_PARTITION_P_RX_U_RX);
783785

784786
if (ret < 0)
785787
return ret;
786788

787789
if (rodata_size) {
790+
tr_err(&lib_manager_tr, ".rodata %#x @ %#lx",
791+
rodata_size, (uintptr_t)va_base_rodata);
788792
ret = llext_manager_add_partition(domain, va_base_rodata, rodata_size,
789793
K_MEM_PARTITION_P_RO_U_RO);
790794
if (ret < 0)
791795
goto e_text;
792796
}
793797

794798
if (data_size) {
799+
tr_err(&lib_manager_tr, ".data %#x @ %#lx",
800+
data_size, (uintptr_t)va_base_data);
795801
ret = llext_manager_add_partition(domain, va_base_data, data_size,
796802
K_MEM_PARTITION_P_RW_U_RW);
797803
if (ret < 0)
@@ -852,7 +858,7 @@ int llext_manager_add_domain(const uint32_t component_id, struct k_mem_domain *d
852858
}
853859

854860
if (text) {
855-
tr_dbg(&lib_manager_tr, ".cold %#x @ %#lx",
861+
tr_err(&lib_manager_tr, ".cold %#x @ %#lx",
856862
shdr_cold.sh_size, (uintptr_t)text_addr + text_offset);
857863
ret = llext_manager_add_partition(domain, (uintptr_t)text_addr + text_offset,
858864
shdr_cold.sh_size,
@@ -864,7 +870,7 @@ int llext_manager_add_domain(const uint32_t component_id, struct k_mem_domain *d
864870
}
865871

866872
if (rodata) {
867-
tr_dbg(&lib_manager_tr, ".coldrodata %#x @ %#lx",
873+
tr_err(&lib_manager_tr, ".coldrodata %#x @ %#lx",
868874
shdr_coldrodata.sh_size, (uintptr_t)rodata_addr + rodata_offset);
869875
ret = llext_manager_add_partition(domain, (uintptr_t)rodata_addr + rodata_offset,
870876
shdr_coldrodata.sh_size,

0 commit comments

Comments
 (0)