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

Merge branch '1.0-stable'

This commit is contained in:
Liam Girdwood 2017-12-22 16:04:34 +00:00
parent a9e1b6c673 1a8a653af8
commit 8c7108ae82
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -132,6 +132,8 @@ AS_IF([test "x$enable_dma_trace" != "xno"], [
AC_DEFINE([CONFIG_DMA_TRACE], [1], [Configure DMA trace])
])
AM_CONDITIONAL(BUILD_DMA_TRACE, test "x$enable_dma_trace" != "xno")
# Test after CFLAGS set othewise test of cross compiler fails.
AM_PROG_AS
AM_PROG_AR

6
src/lib/Makefile.am
View File

@ -6,10 +6,14 @@ libcore_a_SOURCES = \
work.c \
notifier.c \
trace.c \
dma-trace.c \
schedule.c \
agent.c
if BUILD_DMA_TRACE
libcore_a_SOURCES += \
dma-trace.c
endif
libcore_a_CFLAGS = \
$(ARCH_CFLAGS) \
$(ARCH_INCDIR) \

8
src/lib/trace.c
View File

@ -49,7 +49,9 @@ void _trace_error(uint32_t event)
{
unsigned long flags;
volatile uint64_t *t;
#if defined(CONFIG_DMA_TRACE)
uint64_t dt[2];
#endif
uint64_t time;
if (!trace.enable)
@ -57,10 +59,12 @@ void _trace_error(uint32_t event)
time = platform_timer_get(platform_timer);
#if defined(CONFIG_DMA_TRACE)
/* save event to DMA tracing buffer */
dt[0] = time;
dt[1] = event;
dtrace_event((const char*)dt, sizeof(uint64_t) * 2);
#endif
/* send event by mail box too. */
spin_lock_irq(&trace.lock, flags);
@ -84,7 +88,9 @@ void _trace_error(uint32_t event)
void _trace_error_atomic(uint32_t event)
{
volatile uint64_t *t;
#if defined(CONFIG_DMA_TRACE)
uint64_t dt[2];
#endif
uint64_t time;
if (!trace.enable)
@ -92,10 +98,12 @@ void _trace_error_atomic(uint32_t event)
time = platform_timer_get(platform_timer);
#if defined(CONFIG_DMA_TRACE)
/* save event to DMA tracing buffer */
dt[0] = time;
dt[1] = event;
dtrace_event_atomic((const char*)dt, sizeof(uint64_t) * 2);
#endif
/* write timestamp and event to trace buffer */
t = (volatile uint64_t*)(MAILBOX_TRACE_BASE + trace.pos);