Merge pull request #197 from tlauda/topic/cavs_memmap

cavs: memory: fix cAVS platforms memory map

Author: lgirdwood

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

@@ -132,14 +132,12 @@
 #define L2_SRAM_SIZE		0x00056000
 
 /* Heap section sizes for module pool */
-#define HEAP_RT_COUNT8			0
 #define HEAP_RT_COUNT16			256
 #define HEAP_RT_COUNT32			128
 #define HEAP_RT_COUNT64			64
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		0
 
 #define L2_VECTOR_SIZE			0x1000
 
@@ -151,17 +149,13 @@
 
 #define HEAP_RUNTIME_BASE		(HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE)
 #define HEAP_RUNTIME_SIZE \
-	(HEAP_RT_COUNT8 * 8 + HEAP_RT_COUNT16 * 16 + \
-	HEAP_RT_COUNT32 * 32 + HEAP_RT_COUNT64 * 64 + \
-	HEAP_RT_COUNT128 * 128 + HEAP_RT_COUNT256 * 256 + \
-	HEAP_RT_COUNT512 * 512 + HEAP_RT_COUNT1024 * 1024)
+	(HEAP_RT_COUNT16 * 16 + HEAP_RT_COUNT32 * 32 + \
+	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)
-#define HEAP_BUFFER_SIZE	\
-    (L2_SRAM_SIZE - L2_VECTOR_SIZE - SOF_TEXT_SIZE - SOF_DATA_SIZE - \
-     SOF_BSS_DATA_SIZE - HEAP_RUNTIME_SIZE - SOF_STACK_SIZE - HEAP_SYSTEM_SIZE)
-
-#define HEAP_BUFFER_BLOCK_SIZE		0x180
+#define HEAP_BUFFER_BASE	(HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE)
+#define HEAP_BUFFER_SIZE	(SOF_STACK_END - HEAP_BUFFER_BASE)
+#define HEAP_BUFFER_BLOCK_SIZE	0x180
 #define HEAP_BUFFER_COUNT	(HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE)
 
 
@@ -259,7 +253,7 @@
 #endif
 
 /* bss data */
-#define SOF_BSS_DATA_SIZE	0x8300
+#define SOF_BSS_DATA_SIZE	0x8700
 
 /* Stack configuration */
 #define SOF_STACK_SIZE		0x1000

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

@@ -169,14 +169,12 @@
 #define HP_SRAM_VECBASE_RESET	(HP_SRAM_BASE + 0x40000)
 
 /* Heap section sizes for module pool */
-#define HEAP_RT_COUNT8			0
 #define HEAP_RT_COUNT16			256
 #define HEAP_RT_COUNT32			128
 #define HEAP_RT_COUNT64			64
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		0
 
 #define L2_VECTOR_SIZE		0x1000
 
@@ -251,10 +249,9 @@
 
 #define HEAP_RUNTIME_BASE		(HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE)
 #define HEAP_RUNTIME_SIZE \
-	(HEAP_RT_COUNT8 * 8 + HEAP_RT_COUNT16 * 16 + \
-	HEAP_RT_COUNT32 * 32 + HEAP_RT_COUNT64 * 64 + \
-	HEAP_RT_COUNT128 * 128 + HEAP_RT_COUNT256 * 256 + \
-	HEAP_RT_COUNT512 * 512 + HEAP_RT_COUNT1024 * 1024)
+	(HEAP_RT_COUNT16 * 16 + HEAP_RT_COUNT32 * 32 + \
+	HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
+	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
 
 /* Stack configuration */
 #define SOF_STACK_SIZE				0x2000

src/platform/intel/cavs/memory.c

@@ -31,22 +31,13 @@
 
 #include <sof/alloc.h>
 
-#if defined(CONFIG_APOLLOLAKE)
-#define TOTAL_HEAP_SIZE (HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE + \
-	HEAP_HP_BUFFER_SIZE + HEAP_LP_BUFFER_SIZE)
-#elif defined(CONFIG_CANNONLAKE)
-#define TOTAL_HEAP_SIZE (HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE + \
-	HEAP_BUFFER_SIZE)
-#endif
-
 /* 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];
-static struct block_hdr mod_block1024[HEAP_RT_COUNT1024];
 
 /* Heap memory map for modules */
 static struct block_map rt_heap_map[] = {
@@ -56,7 +47,6 @@ static struct block_map rt_heap_map[] = {
 	BLOCK_DEF(128, HEAP_RT_COUNT128, mod_block128),
 	BLOCK_DEF(256, HEAP_RT_COUNT256, mod_block256),
 	BLOCK_DEF(512, HEAP_RT_COUNT512, mod_block512),
-	BLOCK_DEF(1024, HEAP_RT_COUNT1024, mod_block1024),
 };
 
 /* Heap blocks for buffers */
@@ -123,5 +113,7 @@ struct mm memmap = {
 		.caps = SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_LP |
 			SOF_MEM_CAPS_CACHE | SOF_MEM_CAPS_DMA,
 	},
-	.total = {.free = TOTAL_HEAP_SIZE,},
+	.total = {.free = HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE +
+			HEAP_BUFFER_SIZE + HEAP_HP_BUFFER_SIZE +
+			HEAP_LP_BUFFER_SIZE,},
 };