@@ -398,42 +398,33 @@ static int user_worker_call(struct userspace_context *user, struct processing_mo
398398static int userspace_proxy_memory_init (struct userspace_context * user ,
399399 const struct comp_driver * drv )
400400{
401- const uintptr_t shd_addr = get_shared_heap_start ();
402- const size_t shd_size = get_shared_heap_size ();
403401 uintptr_t addr_aligned ;
404402 size_t size_aligned ;
405403
406404 /* Add shared heap uncached and cached space to memory partitions */
407- struct k_mem_partition parts [3 ];
405+ struct k_mem_partition parts [2 ];
408406 struct k_mem_partition * parts_ptr [] = {
409407 & ipc_partition ,
410- & parts [0 ],
411408#ifndef CONFIG_XTENSA_MMU_DOUBLE_MAP
412- & parts [1 ],
409+ & parts [0 ],
413410#endif /* CONFIG_XTENSA_MMU_DOUBLE_MAP */
414- & parts [2 ]
411+ & parts [1 ]
415412 };
416- k_mem_region_align (& addr_aligned , & size_aligned , shd_addr , shd_size ,
417- CONFIG_MM_DRV_PAGE_SIZE );
418- parts [0 ].start = addr_aligned ;
419- parts [0 ].size = size_aligned ;
420- parts [0 ].attr = K_MEM_PARTITION_P_RW_U_RW ;
421-
422413#ifndef CONFIG_XTENSA_MMU_DOUBLE_MAP
423414 k_mem_region_align (& addr_aligned , & size_aligned ,
424415 POINTER_TO_UINT (sys_cache_cached_ptr_get (UINT_TO_POINTER (shd_addr ))),
425416 shd_size , CONFIG_MM_DRV_PAGE_SIZE );
426- parts [1 ].start = addr_aligned ;
427- parts [1 ].size = size_aligned ;
428- parts [1 ].attr = K_MEM_PARTITION_P_RW_U_RW ;
417+ parts [0 ].start = addr_aligned ;
418+ parts [0 ].size = size_aligned ;
419+ parts [0 ].attr = K_MEM_PARTITION_P_RW_U_RW ;
429420#endif /* CONFIG_XTENSA_MMU_DOUBLE_MAP */
430421
431422 /* Add module private heap to memory partitions */
432423 k_mem_region_align (& addr_aligned , & size_aligned , POINTER_TO_UINT (drv -> drv_heap -> init_mem ),
433424 DRV_HEAP_SIZE , CONFIG_MM_DRV_PAGE_SIZE );
434- parts [2 ].start = addr_aligned ;
435- parts [2 ].size = size_aligned ;
436- parts [2 ].attr = K_MEM_PARTITION_P_RW_U_RW ;
425+ parts [1 ].start = addr_aligned ;
426+ parts [1 ].size = size_aligned ;
427+ parts [1 ].attr = K_MEM_PARTITION_P_RW_U_RW ;
437428
438429 arch_mem_map ((void * )ipc_partition .start , (uintptr_t )ipc_partition .start , ipc_partition .size , K_MEM_PERM_USER | K_MEM_PERM_RW );
439430
0 commit comments