Merge pull request #464 from singalsu/fix_bug_in_new_1k_alloc_buffers

Memory: Fix bug in previous commit that introduced 1k buffers

Author: lgirdwood

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

@@ -136,7 +136,7 @@
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		1
+#define HEAP_RT_COUNT1024		4
 
 #define L2_VECTOR_SIZE			0x1000
 
@@ -154,7 +154,8 @@
 #define HEAP_RUNTIME_BASE	(HEAP_SYSTEM_1_BASE + HEAP_SYSTEM_1_SIZE)
 #define HEAP_RUNTIME_SIZE \
 	(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
-	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
+	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
+	HEAP_RT_COUNT1024 * 1024)
 
 #define HEAP_BUFFER_BASE	(HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE)
 #define HEAP_BUFFER_SIZE	(SOF_STACK_END - HEAP_BUFFER_BASE)

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

@@ -176,7 +176,7 @@
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		1
+#define HEAP_RT_COUNT1024		4
 
 #define L2_VECTOR_SIZE		0x1000
 
@@ -266,7 +266,8 @@
 #define HEAP_RUNTIME_BASE	(HEAP_SYSTEM_3_BASE + HEAP_SYSTEM_3_SIZE)
 #define HEAP_RUNTIME_SIZE \
 	(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
-	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
+	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
+	HEAP_RT_COUNT1024 * 1024)
 
 /* Stack configuration */
 #define SOF_STACK_SIZE				0x2000

src/platform/icelake/include/platform/memory.h

@@ -176,7 +176,7 @@
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		1
+#define HEAP_RT_COUNT1024		4
 
 #define L2_VECTOR_SIZE		0x1000
 
@@ -266,7 +266,8 @@
 #define HEAP_RUNTIME_BASE	(HEAP_SYSTEM_3_BASE + HEAP_SYSTEM_3_SIZE)
 #define HEAP_RUNTIME_SIZE \
 	(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
-	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
+	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
+	HEAP_RT_COUNT1024 * 1024)
 
 /* Stack configuration */
 #define SOF_STACK_SIZE				0x2000

src/platform/suecreek/include/platform/memory.h

@@ -164,7 +164,7 @@
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		1
+#define HEAP_RT_COUNT1024		4
 
 #define L2_VECTOR_SIZE		0x2000
 
@@ -221,7 +221,8 @@
 #define HEAP_RUNTIME_BASE	(HEAP_SYSTEM_1_BASE + HEAP_SYSTEM_1_SIZE)
 #define HEAP_RUNTIME_SIZE \
 	(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
-	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
+	HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
+	HEAP_RT_COUNT1024 * 1024)
 
 /* Stack configuration */
 #define SOF_STACK_SIZE				0x2000