Merge pull request #219 from tlauda/topic/memory_cache_line_align

cavs: memory: align runtime heap buffers to cache lines

Author: lgirdwood

src/platform/apollolake/include/platform/memory.h

@@ -132,9 +132,7 @@
 #define L2_SRAM_SIZE		0x00056000
 
 /* Heap section sizes for module pool */
-#define HEAP_RT_COUNT16			256
-#define HEAP_RT_COUNT32			128
-#define HEAP_RT_COUNT64			64
+#define HEAP_RT_COUNT64			256
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
@@ -149,8 +147,7 @@
 
 #define HEAP_RUNTIME_BASE		(HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE)
 #define HEAP_RUNTIME_SIZE \
-	(HEAP_RT_COUNT16 * 16 + HEAP_RT_COUNT32 * 32 + \
-	HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
+	(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
 	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
 
 #define HEAP_BUFFER_BASE	(HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE)

src/platform/cannonlake/include/platform/memory.h

@@ -169,9 +169,7 @@
 #define HP_SRAM_VECBASE_RESET	(HP_SRAM_BASE + 0x40000)
 
 /* Heap section sizes for module pool */
-#define HEAP_RT_COUNT16			256
-#define HEAP_RT_COUNT32			128
-#define HEAP_RT_COUNT64			64
+#define HEAP_RT_COUNT64			256
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
@@ -249,8 +247,7 @@
 
 #define HEAP_RUNTIME_BASE		(HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE)
 #define HEAP_RUNTIME_SIZE \
-	(HEAP_RT_COUNT16 * 16 + HEAP_RT_COUNT32 * 32 + \
-	HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
+	(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
 	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
 
 /* Stack configuration */

src/platform/intel/cavs/memory.c

@@ -32,17 +32,13 @@
 #include <sof/alloc.h>
 
 /* Heap blocks for modules */
-static struct block_hdr mod_block16[HEAP_RT_COUNT16];
-static struct block_hdr mod_block32[HEAP_RT_COUNT32];
 static struct block_hdr mod_block64[HEAP_RT_COUNT64];
 static struct block_hdr mod_block128[HEAP_RT_COUNT128];
 static struct block_hdr mod_block256[HEAP_RT_COUNT256];
 static struct block_hdr mod_block512[HEAP_RT_COUNT512];
 
 /* Heap memory map for modules */
 static struct block_map rt_heap_map[] = {
-	BLOCK_DEF(16, HEAP_RT_COUNT16, mod_block16),
-	BLOCK_DEF(32, HEAP_RT_COUNT32, mod_block32),
 	BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64),
 	BLOCK_DEF(128, HEAP_RT_COUNT128, mod_block128),
 	BLOCK_DEF(256, HEAP_RT_COUNT256, mod_block256),