From a01139e0836751617efc9fb82c9ddc340cd86687 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Mon, 26 Feb 2024 15:49:11 +0100 Subject: [PATCH] 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 --- west.yml | 2 +- zephyr/lib/alloc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/west.yml b/west.yml index 80541ded3375..45cdbd7d5589 100644 --- a/west.yml +++ b/west.yml @@ -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 diff --git a/zephyr/lib/alloc.c b/zephyr/lib/alloc.c index 7a395397fe88..c931eeb5658a 100644 --- a/zephyr/lib/alloc.c +++ b/zephyr/lib/alloc.c @@ -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));