Merge pull request #495 from mmaka1/drv-alloc-fix

alloc: fixed memory leaks in dw-dma

Author: lgirdwood

src/drivers/intel/cavs/dmic.c

@@ -1454,7 +1454,7 @@ static int dmic_probe(struct dai *dai)
 	pm_runtime_get_sync(DMIC_CLK, dai->index);
 
 	/* allocate private data */
-	dmic = rzalloc(RZONE_SYS | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
+	dmic = rzalloc(RZONE_RUNTIME | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
 		       sizeof(*dmic));
 	if (!dmic) {
 		trace_dmic_error("eap");

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

@@ -614,8 +614,12 @@ static int hda_dma_probe(struct dma *dma)
 		return -EEXIST; /* already created */
 
 	/* allocate private data */
-	hda_pdata = rzalloc(RZONE_SYS | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
-			    sizeof(*hda_pdata));
+	hda_pdata = rzalloc(RZONE_RUNTIME | RZONE_FLAG_UNCACHED,
+			    SOF_MEM_CAPS_RAM, sizeof(*hda_pdata));
+	if (!hda_pdata) {
+		trace_error(TRACE_CLASS_DMA, "alloc failed");
+		return -ENOMEM;
+	}
 	dma_set_drvdata(dma, hda_pdata);
 
 	/* init channel status */

src/drivers/intel/cavs/ssp.c

@@ -875,8 +875,12 @@ static int ssp_probe(struct dai *dai)
 	pm_runtime_get_sync(SSP_CLK, dai->index);
 
 	/* allocate private data */
-	ssp = rzalloc(RZONE_SYS | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
+	ssp = rzalloc(RZONE_RUNTIME | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
 		      sizeof(*ssp));
+	if (!ssp) {
+		trace_error(TRACE_CLASS_DAI, "alloc failed");
+		return -ENOMEM;
+	}
 	dai_set_drvdata(dai, ssp);
 
 	ssp->state[DAI_DIR_PLAYBACK] = COMP_STATE_READY;

src/drivers/intel/dw-dma.c

@@ -1136,6 +1136,8 @@ static inline void dw_dma_interrupt_register(struct dma *dma, int channel)
 	uint32_t irq = dma_irq(dma, cpu_get_id()) +
 		(channel << SOF_IRQ_BIT_SHIFT);
 
+	trace_event(TRACE_CLASS_DMA, "dw-dma-int-register");
+
 	interrupt_register(irq, IRQ_AUTO_UNMASK, dw_dma_irq_handler,
 			   &p->chan[channel].id);
 	interrupt_enable(irq);
@@ -1278,8 +1280,12 @@ static int dw_dma_probe(struct dma *dma)
 	pm_runtime_get_sync(DW_DMAC_CLK, dma->plat_data.id);
 
 	/* allocate private data */
-	dw_pdata = rzalloc(RZONE_SYS | RZONE_FLAG_UNCACHED, SOF_MEM_CAPS_RAM,
-			   sizeof(*dw_pdata));
+	dw_pdata = rzalloc(RZONE_RUNTIME | RZONE_FLAG_UNCACHED,
+			   SOF_MEM_CAPS_RAM, sizeof(*dw_pdata));
+	if (!dw_pdata) {
+		trace_error(TRACE_CLASS_DMA, "alloc failed");
+		return -ENOMEM;
+	}
 	dma_set_drvdata(dma, dw_pdata);
 
 	spinlock_init(&dma->lock);

src/lib/alloc.c

@@ -127,7 +127,9 @@ static void *rmalloc_sys(int zone, int core, size_t bytes)
 
 	/* always succeeds or panics */
 	if (alignment + bytes > cpu_heap->info.free) {
-		trace_mem_error("eM1");
+		trace_error(TRACE_CLASS_MEM,
+			    "rmalloc-sys eM1 zone %x core %d bytes %d",
+			    zone, core, bytes);
 		panic(SOF_IPC_PANIC_MEM);
 	}
 	cpu_heap->info.used += alignment;
@@ -419,9 +421,9 @@ static void *rmalloc_runtime(int zone, uint32_t caps, size_t bytes)
 	return ptr;
 
 error:
-	trace_mem_error("eMm");
-	trace_error_value(bytes);
-	trace_error_value(caps);
+	trace_error(TRACE_CLASS_MEM,
+		    "rmalloc-runtime eMm zone %d caps %x bytes %d",
+		    zone, caps, bytes);
 	return NULL;
 }
 

src/lib/interrupt.c

@@ -55,8 +55,10 @@ static int irq_register_child(struct irq_desc *parent, int irq, int unmask,
 
 	spin_lock(&parent->lock);
 
-	/* init child */
-	child = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM,
+	/* init child from run-time, may be registered and unregistered
+	 * many times at run-time
+	 */
+	child = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM,
 			sizeof(struct irq_desc));
 	if (!child) {
 		ret = -ENOMEM;
@@ -102,6 +104,7 @@ static void irq_unregister_child(struct irq_desc *parent, int irq)
 		if (SOF_IRQ_ID(irq) == child->id) {
 			list_item_del(&child->irq_list);
 			parent->num_children--;
+			rfree(child);
 		}
 	}