plat: apl: clocks gated back on topology free

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

Author: Marcin Maka

src/audio/dai.c

@@ -186,7 +186,7 @@ static struct comp_dev *dai_new(struct sof_ipc_comp *comp)
 
 	comp_set_drvdata(dev, dd);
 
-	dd->dai = dai_get(dai->type, dai->dai_index);
+	dd->dai = dai_get(dai->type, dai->dai_index, DAI_CREAT);
 	if (dd->dai == NULL) {
 		trace_dai_error("eDg");
 		goto error;
@@ -237,6 +237,9 @@ static void dai_free(struct comp_dev *dev)
 	struct dai_data *dd = comp_get_drvdata(dev);
 
 	dma_channel_put(dd->dma, dd->chan);
+	dma_put(dd->dma);
+
+	dai_put(dd->dai);
 
 	rfree(dd);
 	rfree(dev);

src/audio/host.c

@@ -398,6 +398,7 @@ static void host_free(struct comp_dev *dev)
 #if !defined CONFIG_DMA_GW
 	dma_channel_put(hd->dma, hd->chan);
 #endif
+	dma_put(hd->dma);
 
 	dma_sg_free(&hd->config.elem_array);
 	rfree(hd);

src/drivers/intel/cavs/dmic.c

@@ -1475,19 +1475,34 @@ static int dmic_probe(struct dai *dai)
 	return 0;
 }
 
+static int dmic_remove(struct dai *dai)
+{
+	interrupt_disable(dmic_irq(dai));
+	platform_interrupt_mask(dmic_irq(dai), 0);
+	interrupt_unregister(dmic_irq(dai));
+
+	pm_runtime_put_sync(DMIC_CLK, dai->index);
+
+	rfree(dma_get_drvdata(dai));
+	dai_set_drvdata(dai, NULL);
+
+	return 0;
+}
+
 /* DMIC has no loopback support */
 static inline int dmic_set_loopback_mode(struct dai *dai, uint32_t lbm)
 {
 	return -EINVAL;
 }
 
 const struct dai_ops dmic_ops = {
-	.trigger = dmic_trigger,
-	.set_config = dmic_set_config,
-	.pm_context_store = dmic_context_store,
-	.pm_context_restore = dmic_context_restore,
-	.probe = dmic_probe,
-	.set_loopback_mode = dmic_set_loopback_mode,
+	.trigger		= dmic_trigger,
+	.set_config		= dmic_set_config,
+	.pm_context_store	= dmic_context_store,
+	.pm_context_restore	= dmic_context_restore,
+	.probe			= dmic_probe,
+	.remove			= dmic_remove,
+	.set_loopback_mode	= dmic_set_loopback_mode,
 };
 
 #endif

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

@@ -633,6 +633,13 @@ static int hda_dma_probe(struct dma *dma)
 	return 0;
 }
 
+static int hda_dma_remove(struct dma *dma)
+{
+	rfree(dma_get_drvdata(dma));
+	dma_set_drvdata(dma, NULL);
+	return 0;
+}
+
 const struct dma_ops hda_host_dma_ops = {
 	.channel_get	= hda_dma_channel_get,
 	.channel_put	= hda_dma_channel_put,
@@ -647,6 +654,7 @@ const struct dma_ops hda_host_dma_ops = {
 	.pm_context_restore		= hda_dma_pm_context_restore,
 	.pm_context_store		= hda_dma_pm_context_store,
 	.probe		= hda_dma_probe,
+	.remove		= hda_dma_remove,
 };
 
 const struct dma_ops hda_link_dma_ops = {
@@ -663,5 +671,6 @@ const struct dma_ops hda_link_dma_ops = {
 	.pm_context_restore		= hda_dma_pm_context_restore,
 	.pm_context_store		= hda_dma_pm_context_store,
 	.probe		= hda_dma_probe,
+	.remove		= hda_dma_remove,
 };
 

src/drivers/intel/cavs/hda.c

@@ -58,5 +58,6 @@ const struct dai_ops hda_ops = {
 	.pm_context_store	= hda_dummy,
 	.pm_context_restore	= hda_dummy,
 	.probe			= hda_dummy,
+	.remove			= hda_dummy,
 	.set_loopback_mode	= hda_set_loopback_mode
 };

src/drivers/intel/cavs/ssp.c

@@ -893,11 +893,26 @@ static int ssp_probe(struct dai *dai)
 	return 0;
 }
 
+static int ssp_remove(struct dai *dai)
+{
+	interrupt_disable(ssp_irq(dai));
+	platform_interrupt_mask(ssp_irq(dai), 0);
+	interrupt_unregister(ssp_irq(dai));
+
+	pm_runtime_put_sync(SSP_CLK, dai->index);
+
+	rfree(dma_get_drvdata(dai));
+	dai_set_drvdata(dai, NULL);
+
+	return 0;
+}
+
 const struct dai_ops ssp_ops = {
 	.trigger		= ssp_trigger,
 	.set_config		= ssp_set_config,
 	.pm_context_store	= ssp_context_store,
 	.pm_context_restore	= ssp_context_restore,
 	.probe			= ssp_probe,
+	.remove			= ssp_remove,
 	.set_loopback_mode	= ssp_set_loopback_mode,
 };

src/drivers/intel/dw-dma.c

@@ -1299,6 +1299,14 @@ static int dw_dma_probe(struct dma *dma)
 	return 0;
 }
 
+static int dw_dma_remove(struct dma *dma)
+{
+	pm_runtime_put_sync(DW_DMAC_CLK, dma->plat_data.id);
+	rfree(dma_get_drvdata(dma));
+	dma_set_drvdata(dma, NULL);
+	return 0;
+}
+
 const struct dma_ops dw_dma_ops = {
 	.channel_get	= dw_dma_channel_get,
 	.channel_put	= dw_dma_channel_put,
@@ -1312,4 +1320,5 @@ const struct dma_ops dw_dma_ops = {
 	.pm_context_restore		= dw_dma_pm_context_restore,
 	.pm_context_store		= dw_dma_pm_context_store,
 	.probe		= dw_dma_probe,
+	.remove		= dw_dma_remove,
 };

src/host/common_test.c

@@ -223,16 +223,24 @@ int get_index_by_type(uint32_t comp_type,
 
 /* The following definitions are to satisfy libsof linker errors */
 
-struct dai *dai_get(uint32_t type, uint32_t index)
+struct dai *dai_get(uint32_t type, uint32_t index, uint32_t flags)
 {
 	return NULL;
 }
 
+void dai_put(struct dai *dai)
+{
+}
+
 struct dma *dma_get(uint32_t dir, uint32_t caps, uint32_t dev, uint32_t flags)
 {
 	return NULL;
 }
 
+void dma_put(struct dma *dma)
+{
+}
+
 int dma_sg_alloc(struct dma_sg_elem_array *elem_array,
 		 int zone,
 		 uint32_t direction,

src/include/sof/dai.h

@@ -63,8 +63,14 @@
 #define DAI_NUM_SLOT_MAPS	8
 
 /* DAI flags */
-#define DAI_FLAGS_IRQ_CB	(1 << 0)	/* irq used for copy() timer */
 
+/** \brief IRQ used for copy() timer */
+#define DAI_FLAGS_IRQ_CB	BIT(0)
+
+/* DAI get() flags */
+
+/** \brief If the device does not exist it will be created */
+#define DAI_CREAT		BIT(0)
 
 struct dai;
 
@@ -77,6 +83,7 @@ struct dai_ops {
 	int (*pm_context_restore)(struct dai *dai);
 	int (*pm_context_store)(struct dai *dai);
 	int (*probe)(struct dai *dai);
+	int (*remove)(struct dai *dai);
 	int (*set_loopback_mode)(struct dai *dai, uint32_t lbm);
 };
 
@@ -140,8 +147,16 @@ void dai_install(struct dai_type_info *dai_type_array, size_t num_dai_types);
  *
  * \param[in] type Type of requested DAI.
  * \param[in] index Index of requested DAI.
+ * \param[in] flags Flags (CREATE)
+ */
+struct dai *dai_get(uint32_t type, uint32_t index, uint32_t flags);
+
+/**
+ * \brief API to release a platform DAI.
+ *
+ * @param[in] dai DAI to relese.
  */
-struct dai *dai_get(uint32_t type, uint32_t index);
+void dai_put(struct dai *dai);
 
 #define dai_set_drvdata(dai, data) \
 	dai->private = data;
@@ -203,6 +218,14 @@ static inline int dai_probe(struct dai *dai)
 	return dai->ops->probe(dai);
 }
 
+/**
+ * \brief Digital Audio interface Remove
+ */
+static inline int dai_remove(struct dai *dai)
+{
+	return dai->ops->remove(dai);
+}
+
 /** @}*/
 
 #endif

src/include/sof/dma.h

@@ -154,6 +154,7 @@ struct dma_ops {
 	int (*pm_context_store)(struct dma *dma);
 
 	int (*probe)(struct dma *dma);
+	int (*remove)(struct dma *dma);
 };
 
 /* DMA platform data */
@@ -198,6 +199,13 @@ void dma_install(struct dma *dma_array, size_t num_dmas);
  */
 struct dma *dma_get(uint32_t dir, uint32_t caps, uint32_t dev, uint32_t flags);
 
+/**
+ * \brief API to release a platform DMAC.
+ *
+ * @param[in] dma DMAC to relese.
+ */
+void dma_put(struct dma *dma);
+
 #define dma_set_drvdata(dma, data) \
 	dma->private = data;
 #define dma_get_drvdata(dma) \
@@ -292,6 +300,11 @@ static inline int dma_probe(struct dma *dma)
 	return dma->ops->probe(dma);
 }
 
+static inline int dma_remove(struct dma *dma)
+{
+	return dma->ops->remove(dma);
+}
+
 static inline void dma_sg_init(struct dma_sg_elem_array *ea)
 {
 	ea->count = 0;