Skip to content

Commit a01139e

Browse files
committed
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>
1 parent ec5692d commit a01139e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ manifest:
4343

4444
- name: zephyr
4545
repo-path: zephyr
46-
revision: 9183ceaf911965fd1e30f4172e0518c176ed644a
46+
revision: 9d1df132b1ccf28e8a8a216781ca52c6c47ed1fe
4747
remote: zephyrproject
4848

4949
# Import some projects listed in zephyr/west.yml@revision

zephyr/lib/alloc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ static void __sparse_cache *heap_alloc_aligned_cached(struct k_heap *h,
233233

234234
#ifdef CONFIG_SOF_ZEPHYR_HEAP_CACHED
235235
if (ptr)
236-
ptr = z_soc_cached_ptr((__sparse_force void *)ptr);
236+
ptr = sys_cache_cached_ptr_get((__sparse_force void *)ptr);
237237
#endif
238238

239239
return ptr;
@@ -246,7 +246,7 @@ static void heap_free(struct k_heap *h, void *mem)
246246
void *mem_uncached;
247247

248248
if (is_cached(mem)) {
249-
mem_uncached = z_soc_uncached_ptr((__sparse_force void __sparse_cache *)mem);
249+
mem_uncached = sys_cache_uncached_ptr_get((__sparse_force void __sparse_cache *)mem);
250250
sys_cache_data_flush_and_invd_range(mem,
251251
sys_heap_usable_size(&h->heap, mem_uncached));
252252

0 commit comments

Comments
 (0)