Merge pull request #271 from mmaka1/hda-clk-drift-fix

Hda clk drift fix

Author: lgirdwood

src/drivers/Makefile.am

@@ -35,6 +35,7 @@ if BUILD_CANNONLAKE
 libdrivers_a_SOURCES += \
 	apl-ssp.c \
 	hda-dma.c \
+	cavs-hda.c \
 	dmic.c
 endif
 

src/drivers/hda-dma.c

@@ -84,8 +84,7 @@
 
 #define HDA_DMA_MAX_CHANS		9
 
-/* TODO: 10% adjustment for inaccurate queue timer */
-#define HDA_LINK_1MS_US	1010
+#define HDA_LINK_1MS_US	1000
 
 struct hda_chan_data {
 	struct dma *dma;

src/include/sof/clock.h

@@ -52,6 +52,7 @@ uint32_t clock_set_freq(int clock, unsigned int hz);
 uint32_t clock_get_freq(int clock);
 
 uint64_t clock_us_to_ticks(int clock, uint64_t us);
+uint64_t clock_ms_to_ticks(int clock, uint64_t ms);
 
 uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current);
 

src/lib/work.c

@@ -66,7 +66,8 @@ struct work_queue {
 	spinlock_t lock;
 	struct notifier notifier;	/* notify CPU freq changes */
 	struct work_queue_timesource *ts;	/* time source for work queue */
-	uint32_t ticks_per_usec;	/* ticks per msec */
+	uint32_t ticks_per_usec;	/* ticks per usec */
+	uint32_t ticks_per_msec;	/* ticks per msec */
 	uint64_t run_ticks;	/* ticks when last run */
 };
 
@@ -149,12 +150,18 @@ static inline void work_next_timeout(struct work_queue *queue,
 	struct work *work, uint64_t reschedule_usecs)
 {
 	/* reschedule work */
+	uint64_t next_d = 0;
+
+	if (reschedule_usecs % 1000)
+		next_d = queue->ticks_per_usec * reschedule_usecs;
+	else
+		next_d = queue->ticks_per_msec * (reschedule_usecs / 1000);
+
 	if (work->flags & WORK_SYNC) {
-		work->timeout += queue->ticks_per_usec * reschedule_usecs;
+		work->timeout += next_d;
 	} else {
 		/* calc next run based on work request */
-		work->timeout = queue->ticks_per_usec *
-			reschedule_usecs + queue->run_ticks;
+		work->timeout = next_d + queue->run_ticks;
 	}
 }
 
@@ -349,7 +356,12 @@ void work_schedule(struct work_queue *queue, struct work *w, uint64_t timeout)
 	}
 
 	/* convert timeout micro seconds to CPU clock ticks */
-	w->timeout = queue->ticks_per_usec * timeout + work_get_timer(queue);
+	if (timeout % 1000)
+		w->timeout = queue->ticks_per_usec * timeout +
+			work_get_timer(queue);
+	else
+		w->timeout = queue->ticks_per_msec * (timeout / 1000) +
+			work_get_timer(queue);
 
 	/* insert work into list */
 	list_item_prepend(&w->list, &queue->work);
@@ -450,6 +462,7 @@ struct work_queue *work_new_queue(struct work_queue_timesource *ts)
 	spinlock_init(&queue->lock);
 	queue->ts = ts;
 	queue->ticks_per_usec = clock_us_to_ticks(queue->ts->clk, 1);
+	queue->ticks_per_msec = clock_ms_to_ticks(queue->ts->clk, 1);
 	queue->window_size = queue->ticks_per_usec * PLATFORM_WORKQ_WINDOW;
 
 	/* notification of clk changes */

src/platform/baytrail/clk.c

@@ -234,6 +234,11 @@ uint64_t clock_us_to_ticks(int clock, uint64_t us)
 	return clk_pdata->clk[clock].ticks_per_usec * us;
 }
 
+uint64_t clock_ms_to_ticks(int clock, uint64_t ms)
+{
+	return clk_pdata->clk[clock].ticks_per_usec * ms * 1000;
+}
+
 uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current)
 {
 	uint64_t _current;

src/platform/haswell/clk.c

@@ -168,6 +168,11 @@ uint64_t clock_us_to_ticks(int clock, uint64_t us)
 	return clk_pdata->clk[clock].ticks_per_usec * us;
 }
 
+uint64_t clock_ms_to_ticks(int clock, uint64_t ms)
+{
+	return clk_pdata->clk[clock].ticks_per_usec * ms * 1000;
+}
+
 uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current)
 {
 	uint64_t _current;

src/platform/intel/cavs/clk.c

@@ -50,6 +50,7 @@
 struct clk_data {
 	uint32_t freq;
 	uint32_t ticks_per_usec;
+	uint32_t ticks_per_msec;
 	spinlock_t lock;
 };
 
@@ -60,6 +61,7 @@ struct clk_pdata {
 struct freq_table {
 	uint32_t freq;
 	uint32_t ticks_per_usec;
+	uint32_t ticks_per_msec;
 	uint32_t enc;
 };
 
@@ -69,14 +71,14 @@ static struct clk_pdata *clk_pdata;
 
 #if defined(CONFIG_APOLLOLAKE)
 static const struct freq_table cpu_freq[] = {
-	{100000000, 100, 0x3},
-	{200000000, 200, 0x1},
-	{400000000, 400, 0x0}, /* default */
+	{100000000, 100, 100000, 0x3},
+	{200000000, 200, 200000, 0x1},
+	{400000000, 400, 400000, 0x0}, /* default */
 };
 #elif defined(CONFIG_CANNONLAKE)
 static const struct freq_table cpu_freq[] = {
-	{120000000, 120, 0x0},
-	{400000000, 400, 0x4},
+	{120000000, 120, 120000, 0x0},
+	{400000000, 400, 400000, 0x4},
 };
 #endif
 
@@ -86,13 +88,13 @@ static const struct freq_table cpu_freq[] = {
 
 #if defined(CONFIG_APOLLOLAKE)
 static const struct freq_table ssp_freq[] = {
-	{19200000, 19,},	/* default */
-	{24576000, 24,},
+	{19200000, 19, 19200, },	/* default */
+	{24576000, 24, 24576, },
 };
 #elif defined(CONFIG_CANNONLAKE)
 static const struct freq_table ssp_freq[] = {
-	{19200000, 19,},
-	{24000000, 24,},	/* default */
+	{19200000, 19, 19200, },
+	{24000000, 24, 24000, },	/* default */
 };
 #endif
 
@@ -194,6 +196,11 @@ uint64_t clock_us_to_ticks(int clock, uint64_t us)
 	return clk_pdata->clk[clock].ticks_per_usec * us;
 }
 
+uint64_t clock_ms_to_ticks(int clock, uint64_t ms)
+{
+	return clk_pdata->clk[clock].ticks_per_msec * ms;
+}
+
 uint64_t clock_time_elapsed(int clock, uint64_t previous, uint64_t *current)
 {
 	uint64_t _current;
@@ -230,7 +237,11 @@ void init_platform_clocks(void)
 	clk_pdata->clk[CLK_CPU].freq = cpu_freq[CPU_DEFAULT_IDX].freq;
 	clk_pdata->clk[CLK_CPU].ticks_per_usec =
 			cpu_freq[CPU_DEFAULT_IDX].ticks_per_usec;
+	clk_pdata->clk[CLK_CPU].ticks_per_msec =
+			cpu_freq[CPU_DEFAULT_IDX].ticks_per_msec;
 	clk_pdata->clk[CLK_SSP].freq = ssp_freq[SSP_DEFAULT_IDX].freq;
 	clk_pdata->clk[CLK_SSP].ticks_per_usec =
 			ssp_freq[SSP_DEFAULT_IDX].ticks_per_usec;
+	clk_pdata->clk[CLK_SSP].ticks_per_msec =
+			ssp_freq[SSP_DEFAULT_IDX].ticks_per_msec;
 }