Skip to content

Peter/pr/dtrace init fixes 01 bisect #3 [DO NOT REVIEW] #4925

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

Closed
ujfalusi wants to merge 6 commits into from
Closed

Peter/pr/dtrace init fixes 01 bisect #3 [DO NOT REVIEW] #4925

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c9820d
dma-trace: Simply return with if dma_trace_buffer_init() fails
ujfalusi Oct 15, 2021
81df111
dma-trace: Re-structure the buffer allocation and initialization
ujfalusi Oct 15, 2021
19d873a
dma-trace: Cancel the dtrace task before stopping the channel in reco…
ujfalusi Oct 15, 2021
d791e64
dma-trace: Fix memory leak with buffer allocation on dtrace re-config
ujfalusi Oct 15, 2021
84d8153
Revert "dma-trace: Fix memory leak with buffer allocation on dtrace r…
ujfalusi Oct 27, 2021
363e921
Revert "dma-trace: Cancel the dtrace task before stopping the channel…
ujfalusi Oct 28, 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
78 changes: 43 additions & 35 deletions src/trace/dma-trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,35 +218,58 @@ int dma_trace_host_buffer(struct dma_trace_data *d,
}
#endif

static int dma_trace_buffer_init(struct dma_trace_data *d)
static void dma_trace_buffer_init(struct dma_trace_data *d, void *new_buffer)
{
struct dma_trace_buf *buffer = &d->dmatb;
void *buf;
unsigned int flags;

/* allocate new buffer */
buf = rballoc(0, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA,
DMA_TRACE_LOCAL_SIZE);
if (!buf) {
tr_err(&dt_tr, "dma_trace_buffer_init(): alloc failed");
return -ENOMEM;
}

bzero(buf, DMA_TRACE_LOCAL_SIZE);
dcache_writeback_region(buf, DMA_TRACE_LOCAL_SIZE);

/* initialise the DMA buffer, whole sequence in section */
spin_lock_irq(&d->lock, flags);

buffer->addr = buf;
buffer->size = DMA_TRACE_LOCAL_SIZE;
if (new_buffer) {
buffer->addr = new_buffer;
buffer->end_addr = (char *)buffer->addr + buffer->size;
}
buffer->w_ptr = buffer->addr;
buffer->r_ptr = buffer->addr;
buffer->end_addr = (char *)buffer->addr + buffer->size;
buffer->avail = 0;

bzero(buffer->addr, buffer->size);
dcache_writeback_region(buffer->addr, buffer->size);

d->old_host_offset = 0;
d->posn.host_offset = 0;

spin_unlock_irq(&d->lock, flags);

/* It should be the very first sent log for easy identification. */
mtrace_printf(LOG_LEVEL_INFO,
"SHM: FW ABI 0x%x DBG ABI 0x%x tag " SOF_GIT_TAG " src hash 0x%08x (ldc hash "
META_QUOTE(SOF_SRC_HASH) ")",
SOF_ABI_VERSION, SOF_ABI_DBG_VERSION, SOF_SRC_HASH);

/* Use a different, DMA: prefix to ease identification of log files */
tr_info(&dt_tr,
"DMA: FW ABI 0x%x DBG ABI 0x%x tag " SOF_GIT_TAG " src hash 0x%08x (ldc hash "
META_QUOTE(SOF_SRC_HASH) ")",
SOF_ABI_VERSION, SOF_ABI_DBG_VERSION, SOF_SRC_HASH);
}

static int dma_trace_buffer_alloc(struct dma_trace_data *d)
{
void *buf;

/* allocate new buffer */
buf = rballoc(0, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA,
DMA_TRACE_LOCAL_SIZE);
if (!buf) {
mtrace_printf(LOG_LEVEL_ERROR, "dma_trace_buffer_alloc(): alloc failed");
return -ENOMEM;
}

/* Initialize the dma trace buffer */
dma_trace_buffer_init(d, buf);

return 0;
}

Expand Down Expand Up @@ -407,25 +430,10 @@ int dma_trace_enable(struct dma_trace_data *d)
{
int err;

/* initialize dma trace buffer */
err = dma_trace_buffer_init(d);

if (err < 0) {
mtrace_printf(LOG_LEVEL_ERROR, "dma_trace_enable: buffer_init failed");
goto out;
}

/* It should be the very first sent log for easy identification. */
mtrace_printf(LOG_LEVEL_INFO,
"SHM: FW ABI 0x%x DBG ABI 0x%x tag " SOF_GIT_TAG " src hash 0x%08x (ldc hash "
META_QUOTE(SOF_SRC_HASH) ")",
SOF_ABI_VERSION, SOF_ABI_DBG_VERSION, SOF_SRC_HASH);

/* Use a different, DMA: prefix to ease identification of log files */
tr_info(&dt_tr,
"DMA: FW ABI 0x%x DBG ABI 0x%x tag " SOF_GIT_TAG " src hash 0x%08x (ldc hash "
META_QUOTE(SOF_SRC_HASH) ")",
SOF_ABI_VERSION, SOF_ABI_DBG_VERSION, SOF_SRC_HASH);
/* Allocate and initialize the dma trace buffer */
err = dma_trace_buffer_alloc(d);
if (err < 0)
return err;

#if CONFIG_DMA_GW
/*
Expand Down