Merge pull request #204 from RanderWang/dma_trace_apl

trace: refine dma trace algorithm for apl

Author: lgirdwood

src/lib/dma-trace.c

@@ -56,13 +56,6 @@ static uint64_t trace_work(void *data, uint64_t delay)
 	int32_t size;
 	uint32_t overflow;
 
-	/* any data to copy ? */
-	if (avail == 0)
-		return DMA_TRACE_PERIOD;
-
-	/* DMA trace copying is working */
-	d->copy_in_progress = 1;
-
 	/* make sure we don't write more than buffer */
 	if (avail > DMA_TRACE_LOCAL_SIZE) {
 		overflow = avail - DMA_TRACE_LOCAL_SIZE;
@@ -75,8 +68,15 @@ static uint64_t trace_work(void *data, uint64_t delay)
 	/* support, so do it differently based on HW features */
 	size = dma_trace_get_avali_data(d, buffer, avail);
 
+	/* any data to copy ? */
+	if (size == 0)
+		return DMA_TRACE_PERIOD;
+
 	d->overflow = overflow;
 
+	/* DMA trace copying is working */
+	d->copy_in_progress = 1;
+
 	/* copy this section to host */
 	size = dma_copy_to_host_nowait(&d->dc, config, d->host_offset,
 		buffer->r_ptr, size);
@@ -258,6 +258,9 @@ static int dma_trace_get_avali_data(struct dma_trace_data *d,
 		d->old_host_offset = d->host_offset;
 	}
 
+	if (avail == 0)
+		return 0;
+
 	/* writeback trace data */
 	if (buffer->r_ptr + avail <= buffer->end_addr) {
 		dcache_writeback_region((void *)buffer->r_ptr, avail);
@@ -284,6 +287,9 @@ static int dma_trace_get_avali_data(struct dma_trace_data *d,
 	lsize = avail;
 	hsize = avail;
 
+	if (avail == 0)
+		return 0;
+
 	/* host buffer wrap ? */
 	if (d->host_offset + avail > d->host_size)
 		hsize = d->host_size - d->host_offset;

src/platform/apollolake/include/platform/platform.h

@@ -104,7 +104,7 @@ struct sof;
  * the interval of reschedule DMA trace copying in special case like half
  * fullness of local DMA trace buffer
  */
-#define DMA_TRACE_RESCHEDULE_TIME	5000
+#define DMA_TRACE_RESCHEDULE_TIME	5
 
 /* DSP should be idle in this time frame */
 #define PLATFORM_IDLE_TIME	750000

src/platform/baytrail/include/platform/platform.h

@@ -94,7 +94,7 @@ struct sof;
  * the interval of reschedule DMA trace copying in special case like half
  * fullness of local DMA trace buffer
  */
-#define DMA_TRACE_RESCHEDULE_TIME	5000
+#define DMA_TRACE_RESCHEDULE_TIME	5
 
 /* DSP should be idle in this time frame */
 #define PLATFORM_IDLE_TIME	750000

src/platform/cannonlake/include/platform/platform.h

@@ -110,7 +110,7 @@ struct sof;
  * the interval of reschedule DMA trace copying in special case like half
  * fullness of local DMA trace buffer
  */
-#define DMA_TRACE_RESCHEDULE_TIME	5000
+#define DMA_TRACE_RESCHEDULE_TIME	5
 
 /* DSP should be idle in this time frame */
 #define PLATFORM_IDLE_TIME	750000

src/platform/haswell/include/platform/platform.h

@@ -93,7 +93,7 @@ struct sof;
  * the interval of reschedule DMA trace copying in special case like half
  * fullness of local DMA trace buffer
  */
-#define DMA_TRACE_RESCHEDULE_TIME	5000
+#define DMA_TRACE_RESCHEDULE_TIME	5
 
 /* DSP should be idle in this time frame */
 #define PLATFORM_IDLE_TIME	750000