Merge pull request #449 from thesofproject/revert-445-eq_fir_heap_rt_1k_proposal

Revert "EQ FIR: memory: Add trace error for alloc fail and add a 1024 size buffer"

Author: lgirdwood

src/audio/eq_fir.c

@@ -204,11 +204,8 @@ static int eq_fir_setup(struct comp_data *cd, int nch)
 
 	/* Allocate all FIR channels data in a big chunk and clear it */
 	cd->fir_delay = rzalloc(RZONE_RUNTIME, SOF_MEM_CAPS_RAM, size_sum);
-	if (!cd->fir_delay) {
-		trace_eq_error("eda");
-		trace_value(size_sum);
+	if (!cd->fir_delay)
 		return -ENOMEM;
-	}
 
 	/* Initialize 2nd phase to set EQ delay lines pointers */
 	fir_delay = cd->fir_delay;

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

@@ -136,7 +136,6 @@
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		1
 
 #define L2_VECTOR_SIZE			0x1000
 

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

@@ -176,7 +176,6 @@
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		1
 
 #define L2_VECTOR_SIZE		0x1000
 

src/platform/icelake/include/platform/memory.h

@@ -176,7 +176,6 @@
 #define HEAP_RT_COUNT128		32
 #define HEAP_RT_COUNT256		64
 #define HEAP_RT_COUNT512		32
-#define HEAP_RT_COUNT1024		1
 
 #define L2_VECTOR_SIZE		0x1000
 

src/platform/intel/cavs/memory.c

@@ -36,15 +36,13 @@ static struct block_hdr mod_block64[HEAP_RT_COUNT64];
 static struct block_hdr mod_block128[HEAP_RT_COUNT128];
 static struct block_hdr mod_block256[HEAP_RT_COUNT256];
 static struct block_hdr mod_block512[HEAP_RT_COUNT512];
-static struct block_hdr mod_block1024[HEAP_RT_COUNT1024];
 
 /* Heap memory map for modules */
 static struct block_map rt_heap_map[] = {
 	BLOCK_DEF(64, HEAP_RT_COUNT64, mod_block64),
 	BLOCK_DEF(128, HEAP_RT_COUNT128, mod_block128),
 	BLOCK_DEF(256, HEAP_RT_COUNT256, mod_block256),
 	BLOCK_DEF(512, HEAP_RT_COUNT512, mod_block512),
-	BLOCK_DEF(1024, HEAP_RT_COUNT1024, mod_block1024),
 };
 
 /* Heap blocks for buffers */