OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This patch fixes a regression caused by commit
b5308ee8e6. 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>
This commit is contained in:
Seppo Ingalsuo 2018-10-05 15:31:09 +03:00
parent 0e924219f2
commit 796596d896
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform/apollolake/include/platform/memory.h
View File

@ -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)

5
src/platform/cannonlake/include/platform/memory.h
View File

@ -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

5
src/platform/icelake/include/platform/memory.h
View File

@ -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

5
src/platform/suecreek/include/platform/memory.h
View File

@ -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