OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cache: switch over to the new Zephyr cache API 

z_soc_uncached_ptr() / z_soc_cached_ptr() have been removed from
Zephyr and replaced with sys_cache_uncached_ptr_get() and
sys_cache_cached_ptr_get() respectively.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2024-02-26 15:49:11 +01:00 committed by Daniel Baluta
parent 5f1e6900d9
commit d8d93d3af7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
west.yml
View File

@ -43,7 +43,7 @@ manifest:
- name: zephyr
repo-path: zephyr
revision: 9183ceaf911965fd1e30f4172e0518c176ed644a
revision: 9d1df132b1ccf28e8a8a216781ca52c6c47ed1fe
remote: zephyrproject
# Import some projects listed in zephyr/west.yml@revision

4
zephyr/lib/alloc.c
View File

@ -233,7 +233,7 @@ static void __sparse_cache *heap_alloc_aligned_cached(struct k_heap *h,
#ifdef CONFIG_SOF_ZEPHYR_HEAP_CACHED
if (ptr)
ptr = z_soc_cached_ptr((__sparse_force void *)ptr);
ptr = sys_cache_cached_ptr_get((__sparse_force void *)ptr);
#endif
return ptr;
@ -246,7 +246,7 @@ static void heap_free(struct k_heap *h, void *mem)
void *mem_uncached;
if (is_cached(mem)) {
mem_uncached = z_soc_uncached_ptr((__sparse_force void __sparse_cache *)mem);
mem_uncached = sys_cache_uncached_ptr_get((__sparse_force void __sparse_cache *)mem);
sys_cache_data_flush_and_invd_range(mem,
sys_heap_usable_size(&h->heap, mem_uncached));