plat: apl: clock gating adjusted for dai, dma, and cores

dai clocks ungated and resources allocated on the first use.
dma clocks ungated and resources allocated on the first use.
cores clocks gated in idle.

Signed-off-by: Marcin Maka <marcin.maka@linux.intel.com>

Author: Marcin Maka

Makefile.am

@@ -43,11 +43,6 @@ export ARCH_INCDIR
 
 PLATFORM_INCDIR = -I $(SRC_DIR)/platform/$(PLATFORM)/include
 
-if BUILD_CAVS
-PLATFORM_INCDIR += \
-	-I $(SRC_DIR)/platform/intel/include
-endif
-
 if XCC
 PLATFORM_INCDIR += \
 	-I $(ROOT_DIR)/arch/include

configure.ac

@@ -566,9 +566,6 @@ AC_CONFIG_FILES([
 	src/platform/icelake/include/platform/Makefile
 	src/platform/intel/Makefile
 	src/platform/intel/cavs/Makefile
-	src/platform/intel/include/Makefile
-	src/platform/intel/include/platform/Makefile
-	src/platform/intel/include/platform/cavs/Makefile
 	test/Makefile
 	test/cmocka/Makefile
 ])

src/drivers/intel/baytrail/ssp.c

@@ -57,12 +57,11 @@ static int hweight_32(uint32_t mask)
 /* empty SSP receive FIFO */
 static void ssp_empty_rx_fifo(struct dai *dai)
 {
-	struct ssp_pdata *ssp = dai_get_drvdata(dai);
 	uint32_t sssr;
 	uint32_t entries;
 	uint32_t i;
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	sssr = ssp_read(dai, SSSR);
 
@@ -77,7 +76,7 @@ static void ssp_empty_rx_fifo(struct dai *dai)
 			ssp_read(dai, SSDR);
 	}
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 }
 
 /* save SSP context prior to entering D3 */
@@ -132,7 +131,7 @@ static inline int ssp_set_config(struct dai *dai,
 	bool cbs = false;
 	int ret = 0;
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	/* is playback/capture already running */
 	if (ssp->state[DAI_DIR_PLAYBACK] == COMP_STATE_ACTIVE ||
@@ -473,22 +472,20 @@ static inline int ssp_set_config(struct dai *dai,
 	ssp->state[DAI_DIR_CAPTURE] = COMP_STATE_PREPARE;
 
 out:
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 
 	return ret;
 }
 
 /* Digital Audio interface formatting */
 static inline int ssp_set_loopback_mode(struct dai *dai, uint32_t lbm)
 {
-	struct ssp_pdata *ssp = dai_get_drvdata(dai);
-
 	trace_ssp("loo");
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	ssp_update_bits(dai, SSCR1, SSCR1_LBM, lbm ? SSCR1_LBM : 0);
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 
 	return 0;
 }
@@ -498,7 +495,7 @@ static void ssp_start(struct dai *dai, int direction)
 {
 	struct ssp_pdata *ssp = dai_get_drvdata(dai);
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	/* enable port */
 	ssp_update_bits(dai, SSCR0, SSCR0_SSE, SSCR0_SSE);
@@ -512,15 +509,15 @@ static void ssp_start(struct dai *dai, int direction)
 	else
 		ssp_update_bits(dai, SSCR1, SSCR1_RSRE, SSCR1_RSRE);
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 }
 
 /* stop the SSP for either playback or capture */
 static void ssp_stop(struct dai *dai, int direction)
 {
 	struct ssp_pdata *ssp = dai_get_drvdata(dai);
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	/* stop Rx if neeed */
 	if (direction == DAI_DIR_CAPTURE &&
@@ -548,7 +545,7 @@ static void ssp_stop(struct dai *dai, int direction)
 		trace_ssp("Ss2");
 	}
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 }
 
 static int ssp_trigger(struct dai *dai, int cmd, int direction)
@@ -607,7 +604,7 @@ static int ssp_probe(struct dai *dai)
 		      sizeof(*ssp));
 	dai_set_drvdata(dai, ssp);
 
-	spinlock_init(&ssp->lock);
+	spinlock_init(&dai->lock);
 
 	ssp->state[DAI_DIR_PLAYBACK] = COMP_STATE_READY;
 	ssp->state[DAI_DIR_CAPTURE] = COMP_STATE_READY;

src/drivers/intel/cavs/clk.c

@@ -139,7 +139,7 @@ uint32_t clock_set_freq(int clock, uint32_t hz)
 	notify_data.old_freq = clk_pdata->clk[clock].freq;
 	notify_data.old_ticks_per_msec = clk_pdata->clk[clock].ticks_per_msec;
 
-	/* atomic context for chaning clocks */
+	/* atomic context for changing clocks */
 	spin_lock_irq(&clk_pdata->clk[clock].lock, flags);
 
 	switch (clock) {
@@ -157,6 +157,8 @@ uint32_t clock_set_freq(int clock, uint32_t hz)
 		io_reg_update_bits(SHIM_BASE + SHIM_CLKCTL,
 				   SHIM_CLKCTL_HDCS, 0);
 		#endif
+
+		/* TODO: should handle all cores or pass the index as arg */
 		io_reg_update_bits(SHIM_BASE + SHIM_CLKCTL,
 				   SHIM_CLKCTL_DPCS_MASK(0), cpu_freq[idx].enc);
 

src/drivers/intel/cavs/dmic.c

@@ -31,6 +31,7 @@
 #include <sof/stream.h>
 #include <sof/dmic.h>
 #include <sof/interrupt.h>
+#include <sof/pm_runtime.h>
 #include <sof/math/numbers.h>
 #include <sof/audio/format.h>
 
@@ -207,7 +208,7 @@ static uint64_t dmic_work(void *data, uint64_t delay)
 	int i;
 
 	tracev_dmic("wrk");
-	spin_lock(&dmic->lock);
+	spin_lock(&dai->lock);
 
 	/* Increment gain with logaritmic step.
 	 * Gain is Q2.30 and gain modifier is Q2.14.
@@ -257,7 +258,7 @@ static uint64_t dmic_work(void *data, uint64_t delay)
 			dmic_write(dai, base[i] + OUT_GAIN_RIGHT_B, val);
 		}
 	}
-	spin_unlock(&dmic->lock);
+	spin_unlock(&dai->lock);
 
 	if (gval)
 		return DMIC_UNMUTE_RAMP_US;
@@ -1236,7 +1237,7 @@ static void dmic_start(struct dai *dai)
 	int fir_b;
 
 	/* enable port */
-	spin_lock(&dmic->lock);
+	spin_lock(&dai->lock);
 	trace_dmic("sta");
 	dmic->state = COMP_STATE_ACTIVE;
 	dmic->startcount = 0;
@@ -1305,7 +1306,7 @@ static void dmic_start(struct dai *dai)
 			CIC_CONTROL_SOFT_RESET_BIT, 0);
 	}
 
-	spin_unlock(&dmic->lock);
+	spin_unlock(&dai->lock);
 
 	/* Currently there's no DMIC HW internal mutings and wait times
 	 * applied into this start sequence. It can be implemented here if
@@ -1324,7 +1325,7 @@ static void dmic_stop(struct dai *dai)
 	int i;
 
 	trace_dmic("sto")
-	spin_lock(&dmic->lock);
+	spin_lock(&dai->lock);
 	dmic->state = COMP_STATE_PREPARE;
 
 	/* Stop FIFO packers and set FIFO initialize bits */
@@ -1352,7 +1353,7 @@ static void dmic_stop(struct dai *dai)
 				 FIR_CONTROL_B_MUTE_BIT);
 	}
 
-	spin_unlock(&dmic->lock);
+	spin_unlock(&dai->lock);
 }
 
 /* save DMIC context prior to entering D3 */
@@ -1446,6 +1447,12 @@ static int dmic_probe(struct dai *dai)
 
 	trace_dmic("pro");
 
+	if (dai_get_drvdata(dai))
+		return -EEXIST; /* already created */
+
+	/* Disable dynamic clock gating for dmic before touching any reg */
+	pm_runtime_get_sync(DMIC_CLK, dai->index);
+
 	/* allocate private data */
 	dmic = rzalloc(RZONE_SYS | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
 		       sizeof(*dmic));
@@ -1455,8 +1462,6 @@ static int dmic_probe(struct dai *dai)
 	}
 	dai_set_drvdata(dai, dmic);
 
-	spinlock_init(&dmic->lock);
-
 	/* Set state, note there is no playback direction support */
 	dmic->state = COMP_STATE_READY;
 

src/drivers/intel/cavs/hda-dma.c

@@ -612,13 +612,17 @@ static int hda_dma_probe(struct dma *dma)
 	int i;
 	struct hda_chan_data *chan;
 
+	trace_event(TRACE_CLASS_DMA, "hda-dma-probe %p id %d",
+		    (uintptr_t)dma, dma->plat_data.id);
+
+	if (dma_get_drvdata(dma))
+		return -EEXIST; /* already created */
+
 	/* allocate private data */
 	hda_pdata = rzalloc(RZONE_SYS | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
 			    sizeof(*hda_pdata));
 	dma_set_drvdata(dma, hda_pdata);
 
-	spinlock_init(&dma->lock);
-
 	/* init channel status */
 	chan = hda_pdata->chan;
 

src/drivers/intel/cavs/ssp.c

@@ -36,6 +36,7 @@
 #include <sof/ssp.h>
 #include <sof/alloc.h>
 #include <sof/interrupt.h>
+#include <sof/pm_runtime.h>
 #include <sof/math/numbers.h>
 #include <config.h>
 
@@ -65,29 +66,27 @@ static int hweight_32(uint32_t mask)
 /* empty SSP transmit FIFO */
 static void ssp_empty_tx_fifo(struct dai *dai)
 {
-	struct ssp_pdata *ssp = dai_get_drvdata(dai);
 	uint32_t sssr;
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	sssr = ssp_read(dai, SSSR);
 
 	/* clear interrupt */
 	if (sssr & SSSR_TUR)
 		ssp_write(dai, SSSR, sssr);
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 }
 
 /* empty SSP receive FIFO */
 static void ssp_empty_rx_fifo(struct dai *dai)
 {
-	struct ssp_pdata *ssp = dai_get_drvdata(dai);
 	uint32_t sssr;
 	uint32_t entries;
 	uint32_t i;
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	sssr = ssp_read(dai, SSSR);
 
@@ -102,7 +101,7 @@ static void ssp_empty_rx_fifo(struct dai *dai)
 			ssp_read(dai, SSDR);
 	}
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 }
 
 /* save SSP context prior to entering D3 */
@@ -171,7 +170,7 @@ static inline int ssp_set_config(struct dai *dai,
 	bool start_delay = false;
 	int ret = 0;
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	/* is playback/capture already running */
 	if (ssp->state[DAI_DIR_PLAYBACK] == COMP_STATE_ACTIVE ||
@@ -733,22 +732,20 @@ static inline int ssp_set_config(struct dai *dai,
 	ssp->state[DAI_DIR_CAPTURE] = COMP_STATE_PREPARE;
 
 out:
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 
 	return ret;
 }
 
 /* Digital Audio interface formatting */
 static inline int ssp_set_loopback_mode(struct dai *dai, uint32_t lbm)
 {
-	struct ssp_pdata *ssp = dai_get_drvdata(dai);
-
 	trace_ssp("loo");
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	ssp_update_bits(dai, SSCR1, SSCR1_LBM, lbm ? SSCR1_LBM : 0);
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 
 	return 0;
 }
@@ -758,7 +755,7 @@ static void ssp_start(struct dai *dai, int direction)
 {
 	struct ssp_pdata *ssp = dai_get_drvdata(dai);
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	/* enable port */
 	ssp_update_bits(dai, SSCR0, SSCR0_SSE, SSCR0_SSE);
@@ -775,15 +772,15 @@ static void ssp_start(struct dai *dai, int direction)
 		ssp_update_bits(dai, SSRSA, 0x1 << 8, 0x1 << 8);
 	}
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 }
 
 /* stop the SSP for either playback or capture */
 static void ssp_stop(struct dai *dai, int direction)
 {
 	struct ssp_pdata *ssp = dai_get_drvdata(dai);
 
-	spin_lock(&ssp->lock);
+	spin_lock(&dai->lock);
 
 	/* wait to get valid fifo status */
 	wait_delay(PLATFORM_SSP_STOP_DELAY);
@@ -817,7 +814,7 @@ static void ssp_stop(struct dai *dai, int direction)
 		trace_ssp("Ss2");
 	}
 
-	spin_unlock(&ssp->lock);
+	spin_unlock(&dai->lock);
 }
 
 static int ssp_trigger(struct dai *dai, int cmd, int direction)
@@ -871,13 +868,17 @@ static int ssp_probe(struct dai *dai)
 {
 	struct ssp_pdata *ssp;
 
+	if (dai_get_drvdata(dai))
+		return -EEXIST; /* already created */
+
+	/* Disable dynamic clock gating before touching any register */
+	pm_runtime_get_sync(SSP_CLK, dai->index);
+
 	/* allocate private data */
 	ssp = rzalloc(RZONE_SYS | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
 		      sizeof(*ssp));
 	dai_set_drvdata(dai, ssp);
 
-	spinlock_init(&ssp->lock);
-
 	ssp->state[DAI_DIR_PLAYBACK] = COMP_STATE_READY;
 	ssp->state[DAI_DIR_CAPTURE] = COMP_STATE_READY;