Skip to content

Minor fixes #4753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 3 commits into from
Sep 23, 2021
Merged

Minor fixes #4753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d4d9d8
memory: apollolake: reduce the waste of BUFFER block header
keyonjie Sep 13, 2021
188477d
cmocka: alloc: remove the 200KB+ buffer zone case
keyonjie Sep 15, 2021
b6d640b
library: memory: (cosmetic) add comment about HP_SRAM_SIZE
keyonjie Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/platform/apollolake/include/platform/lib/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,11 @@
#define HEAP_SYSTEM_SHARED_SIZE 0x1500

#define HEAP_BUFFER_BLOCK_SIZE 0x100
#define HEAP_BUFFER_COUNT_MAX (HP_SRAM_SIZE / HEAP_BUFFER_BLOCK_SIZE)
/*
* The buffer zone will not occupy more than half of the HP SRAM on APL,
* enforcing this limit due to the the SRAM size limitations on APL.
*/
#define HEAP_BUFFER_COUNT_MAX (HP_SRAM_SIZE / (HEAP_BUFFER_BLOCK_SIZE * 2))

#define HEAP_SYSTEM_M_SIZE 0x4000 /* heap primary core size */
#define HEAP_SYSTEM_S_SIZE 0x3000 /* heap secondary core size */
Expand Down
1 change: 1 addition & 0 deletions src/platform/library/include/platform/lib/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ static inline uint32_t arch_get_stack_size(void)

#define SRAM_BANK_SIZE 0x10000
#define LP_SRAM_SIZE SRAM_BANK_SIZE
/* use big enough HP_SRAM_SIZE to build all components for the test bench at once */
#define HP_SRAM_SIZE (SRAM_BANK_SIZE * 47)

#define HP_SRAM_BASE 0xBE000000
Expand Down
2 changes: 0 additions & 2 deletions test/cmocka/src/lib/alloc/alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,6 @@ static struct test_case test_cases[] = {
2, TEST_BULK, "rballoc_dma"),
TEST_CASE(256, SOF_MEM_ZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA,
2, TEST_BULK, "rballoc_dma"),
TEST_CASE(2048, SOF_MEM_ZONE_BUFFER, SOF_MEM_CAPS_RAM |
SOF_MEM_CAPS_DMA, 100, TEST_IMMEDIATE_FREE, "rballoc_dma"),
};

static int setup(void **state)
Expand Down