fast_get: entries must be uncached

fast_get entry list is global, it can be accessed from any core, allocate it uncached. Signed-off-by: Guennadi Liakhovetski <[email protected]>
thesofproject · Feb 7, 2025 · 4b30fad · 4b30fad
1 parent ad2f0e5
commit 4b30fad
Showing 1 changed file with 17 additions and 23 deletions.
diff --git a/zephyr/lib/fast-get.c b/zephyr/lib/fast-get.c
@@ -38,33 +38,27 @@ LOG_MODULE_REGISTER(fast_get, CONFIG_SOF_LOG_LEVEL);
 static int fast_get_realloc(struct sof_fast_get_data *data)
 {
 	struct sof_fast_get_entry *entries;
-
-	if (!data->num_entries) {
-		/*
-		 * Allocate 8 entries for the beginning. Currently we only use
-		 * 2 entries at most, so this should provide a reasonable first
-		 * allocation.
-		 */
-		const unsigned int n_entries = 8;
-
-		data->entries = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
-					n_entries * sizeof(*entries));
-		if (!data->entries)
-			return -ENOMEM;
-		data->num_entries = n_entries;
-		return 0;
-	}
-
-	entries = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM,
-			  2 * data->num_entries * sizeof(*entries));
+	/*
+	 * Allocate 8 entries for the beginning. Currently we only use 2 entries
+	 * at most, so this should provide a reasonable first allocation.
+	 */
+	const unsigned int init_n_entries = 8;
+	unsigned int n_entries = data->num_entries ? data->num_entries * 2 : init_n_entries;
+
+	entries = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, SOF_MEM_FLAG_COHERENT, SOF_MEM_CAPS_RAM,
+			  n_entries * sizeof(*entries));
 	if (!entries)
 		return -ENOMEM;
 
-	memcpy_s(entries, 2 * data->num_entries * sizeof(*entries), data->entries,
-		 data->num_entries * sizeof(*entries));
-	rfree(data->entries);
+	if (data->num_entries) {
+		memcpy_s(entries, n_entries * sizeof(*entries), data->entries,
+			 data->num_entries * sizeof(*entries));
+		rfree(data->entries);
+	}
+
 	data->entries = entries;
-	data->num_entries = 2 * data->num_entries;
+	data->num_entries = n_entries;
+
 	return 0;
 }