Skip to content

Commit 796596d

Browse files
singalsusingalsu
committed
Memory: Fix bug in previous commit that introduced 1k buffers
This patch fixes a regression caused by commit b5308ee. The HEAP_RUNTIME_SIZE calculation equation macro missed this buffer totally. The number of 1k buffers is also increased to four to reach size that is multiple of 4096 like other buffer pools. Non-4096 size seems to cause DSP panic. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent 0e92421 commit 796596d

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
#define HEAP_RT_COUNT128 32
137137
#define HEAP_RT_COUNT256 64
138138
#define HEAP_RT_COUNT512 32
139-
#define HEAP_RT_COUNT1024 1
139+
#define HEAP_RT_COUNT1024 4
140140

141141
#define L2_VECTOR_SIZE 0x1000
142142

@@ -154,7 +154,8 @@
154154
#define HEAP_RUNTIME_BASE (HEAP_SYSTEM_1_BASE + HEAP_SYSTEM_1_SIZE)
155155
#define HEAP_RUNTIME_SIZE \
156156
(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
157-
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
157+
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
158+
HEAP_RT_COUNT1024 * 1024)
158159

159160
#define HEAP_BUFFER_BASE (HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE)
160161
#define HEAP_BUFFER_SIZE (SOF_STACK_END - HEAP_BUFFER_BASE)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
#define HEAP_RT_COUNT128 32
177177
#define HEAP_RT_COUNT256 64
178178
#define HEAP_RT_COUNT512 32
179-
#define HEAP_RT_COUNT1024 1
179+
#define HEAP_RT_COUNT1024 4
180180

181181
#define L2_VECTOR_SIZE 0x1000
182182

@@ -266,7 +266,8 @@
266266
#define HEAP_RUNTIME_BASE (HEAP_SYSTEM_3_BASE + HEAP_SYSTEM_3_SIZE)
267267
#define HEAP_RUNTIME_SIZE \
268268
(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
269-
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
269+
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
270+
HEAP_RT_COUNT1024 * 1024)
270271

271272
/* Stack configuration */
272273
#define SOF_STACK_SIZE 0x2000

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
#define HEAP_RT_COUNT128 32
177177
#define HEAP_RT_COUNT256 64
178178
#define HEAP_RT_COUNT512 32
179-
#define HEAP_RT_COUNT1024 1
179+
#define HEAP_RT_COUNT1024 4
180180

181181
#define L2_VECTOR_SIZE 0x1000
182182

@@ -266,7 +266,8 @@
266266
#define HEAP_RUNTIME_BASE (HEAP_SYSTEM_3_BASE + HEAP_SYSTEM_3_SIZE)
267267
#define HEAP_RUNTIME_SIZE \
268268
(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
269-
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
269+
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
270+
HEAP_RT_COUNT1024 * 1024)
270271

271272
/* Stack configuration */
272273
#define SOF_STACK_SIZE 0x2000

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
#define HEAP_RT_COUNT128 32
165165
#define HEAP_RT_COUNT256 64
166166
#define HEAP_RT_COUNT512 32
167-
#define HEAP_RT_COUNT1024 1
167+
#define HEAP_RT_COUNT1024 4
168168

169169
#define L2_VECTOR_SIZE 0x2000
170170

@@ -221,7 +221,8 @@
221221
#define HEAP_RUNTIME_BASE (HEAP_SYSTEM_1_BASE + HEAP_SYSTEM_1_SIZE)
222222
#define HEAP_RUNTIME_SIZE \
223223
(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
224-
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512)
224+
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
225+
HEAP_RT_COUNT1024 * 1024)
225226

226227
/* Stack configuration */
227228
#define SOF_STACK_SIZE 0x2000

0 commit comments

Comments
 (0)