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

Revert "dma-trace: add check to avoid dereference from NULL" 

This reverts commit 89ec377cb5.

As commit 7df367451d ("trace: enable trace after it is ready") is
reverted this is not required anymore. See long previous commit message.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2021-09-13 21:00:00 +00:00 committed by Liam Girdwood
parent f2c13f5e6d
commit a487ca9441
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ipc/dma-copy.c
View File

@ -64,10 +64,6 @@ int dma_copy_to_host_nowait(struct dma_copy *dc, struct dma_sg_config *host_sg,
{
int ret;
/* return if DMA channel is not get yet */
if (!dc->chan)
return -EINVAL;
/* tell gateway to copy */
ret = dma_copy(dc->chan, size, 0);
if (ret < 0)
@ -89,10 +85,6 @@ int dma_copy_to_host_nowait(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t err;
int32_t offset = host_offset;
/* return if DMA channel is not get yet */
if (!dc->chan)
return -EINVAL;
if (size <= 0)
return 0;

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

@ -524,9 +524,7 @@ int platform_init(struct sof *sof)
#elif CONFIG_TRACE
/* Initialize DMA for Trace*/
trace_point(TRACE_BOOT_PLATFORM_DMA_TRACE);
ret = dma_trace_init_complete(sof->dmat);
if (ret < 0)
return ret;
dma_trace_init_complete(sof->dmat);
#endif
/* show heap status */

6
src/trace/dma-trace.c
View File

@ -477,8 +477,9 @@ void dma_trace_on(void)
{
struct dma_trace_data *trace_data = dma_trace_data_get();
if (!trace_data || trace_data->enabled)
if (trace_data->enabled) {
return;
}
trace_data->enabled = 1;
schedule_task(&trace_data->dmat_work, DMA_TRACE_PERIOD,
@ -490,8 +491,9 @@ void dma_trace_off(void)
{
struct dma_trace_data *trace_data = dma_trace_data_get();
if (!trace_data || !trace_data->enabled)
if (!trace_data->enabled) {
return;
}
schedule_task_cancel(&trace_data->dmat_work);
trace_data->enabled = 0;

3
src/trace/trace.c
View File

@ -272,8 +272,9 @@ void trace_log_unfiltered(bool send_atomic, const void *log_entry, const struct
struct trace *trace = trace_get();
va_list vl;
if (!trace || !trace->enable)
if (!trace->enable) {
return;
}
va_start(vl, arg_count);
vatrace_log(send_atomic, (uint32_t)log_entry, ctx, lvl, id_1, id_2, arg_count, vl);