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

Merge pull request #219 from tlauda/topic/memory_cache_line_align 

cavs: memory: align runtime heap buffers to cache lines
This commit is contained in:
Liam Girdwood 2018-08-10 04:17:10 -07:00 committed by GitHub
parent 2ed30b5b04 512de6044e
commit a1af7ff430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

4
src/platform/intel/cavs/memory.c
View File

@ -32,8 +32,6 @@
#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];
@ -41,8 +39,6 @@ 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),