Skip to content

memory: added requesting alignment for buffer heap #1698

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
jajanusz merged 3 commits into from
Oct 11, 2019
Merged

memory: added requesting alignment for buffer heap #1698

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
017e76f
memory: adjust memory sizes for heaps
dabekjakub Sep 10, 2019
3acc5d1
host: Fix memory function definitions
dabekjakub Aug 8, 2019
0b673cb
memory: Add alignment option for allocation
dabekjakub Aug 8, 2019
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
2 changes: 2 additions & 0 deletions src/arch/host/include/arch/lib/cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

#include <stddef.h>

#define PLATFORM_DCACHE_ALIGN sizeof(void *)

static inline void dcache_writeback_region(void *addr, size_t size) {}
static inline void dcache_invalidate_region(void *addr, size_t size) {}
static inline void icache_invalidate_region(void *addr, size_t size) {}
Expand Down
46 changes: 40 additions & 6 deletions src/include/sof/lib/alloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ struct mm_info {
struct block_hdr {
uint16_t size; /* size in blocks for continuous allocation */
uint16_t used; /* usage flags for page */
void *unaligned_ptr; /* align ptr */
} __packed;

struct block_map {
Expand Down Expand Up @@ -105,9 +106,10 @@ struct mm {
/* heap allocation and free */
void *_malloc(int zone, uint32_t caps, size_t bytes);
void *_zalloc(int zone, uint32_t caps, size_t bytes);
void *_balloc(int zone, uint32_t caps, size_t bytes);
void *_balloc(int zone, uint32_t caps, size_t bytes, uint32_t alignment);
void *_realloc(void *ptr, int zone, uint32_t caps, size_t bytes);
void *_brealloc(void *ptr, int zone, uint32_t caps, size_t bytes);
void *_brealloc(void *ptr, int zone, uint32_t caps, size_t bytes,
uint32_t alignment);
void rfree(void *ptr);

#if CONFIG_DEBUG_HEAP
Expand Down Expand Up @@ -143,7 +145,7 @@ void rfree(void *ptr);
#define rballoc(zone, caps, bytes) \
({void *_ptr; \
do { \
_ptr = _balloc(zone, caps, bytes); \
_ptr = _balloc(zone, caps, bytes, PLATFORM_DCACHE_ALIGN);\
if (!_ptr) { \
trace_error(TRACE_CLASS_MEM, \
"failed to alloc 0x%x bytes caps 0x%x", \
Expand All @@ -169,7 +171,34 @@ void rfree(void *ptr);
#define rbrealloc(ptr, zone, caps, bytes) \
({void *_ptr; \
do { \
_ptr = _brealloc(ptr, zone, caps, bytes); \
_ptr = _brealloc(ptr, zone, caps, bytes,\
PLATFORM_DCACHE_ALIGN);\
if (!_ptr) { \
trace_error(TRACE_CLASS_MEM, \
"failed to alloc 0x%x bytes caps 0x%x", \
bytes, caps); \
alloc_trace_buffer_heap(zone, caps, bytes); \
} \
} while (0); \
_ptr; })

#define rbrealloc_a(ptr, zone, caps, bytes, alignment) \
({void *_ptr; \
do { \
_ptr = _brealloc(ptr, zone, caps, bytes, alignment); \
if (!_ptr) { \
trace_error(TRACE_CLASS_MEM, \
"failed to alloc 0x%x bytes caps 0x%x", \
bytes, caps); \
alloc_trace_buffer_heap(zone, caps, bytes); \
} \
} while (0); \
_ptr; })

#define rballoc(zone, caps, bytes, alignment) \
({void *_ptr; \
do { \
_ptr = _balloc(zone, caps, bytes, alignment); \
if (!_ptr) { \
trace_error(TRACE_CLASS_MEM, \
"failed to alloc 0x%x bytes caps 0x%x", \
Expand All @@ -186,11 +215,16 @@ void alloc_trace_buffer_heap(int zone, uint32_t caps, size_t bytes);

#define rmalloc(zone, caps, bytes) _malloc(zone, caps, bytes)
#define rzalloc(zone, caps, bytes) _zalloc(zone, caps, bytes)
#define rballoc(zone, caps, bytes) _balloc(zone, caps, bytes)
#define rballoc(zone, caps, bytes) \
_balloc(zone, caps, bytes, PLATFORM_DCACHE_ALIGN)
#define rballoc_align(zone, caps, bytes, alignment) \
_balloc(zone, caps, bytes, alignment)
#define rrealloc(ptr, zone, caps, bytes) \
_realloc(ptr, zone, caps, bytes)
#define rbrealloc(ptr, zone, caps, bytes) \
_brealloc(ptr, zone, caps, bytes)
_brealloc(ptr, zone, caps, bytes, PLATFORM_DCACHE_ALIGN)
#define rbrealloc_align(ptr, zone, caps, bytes, alignment) \
_brealloc(ptr, zone, caps, bytes, alignment)

#endif

Expand Down
7 changes: 0 additions & 7 deletions src/include/sof/lib/cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,4 @@
/* invalidate data */
#define CACHE_INVALIDATE 1

/* data cache line alignment */
#if DCACHE_LINE_SIZE > 0
#define PLATFORM_DCACHE_ALIGN DCACHE_LINE_SIZE
#else
#define PLATFORM_DCACHE_ALIGN sizeof(void *)
#endif

#endif /* __SOF_LIB_CACHE_H__ */
Loading