[Review] Add support for compressed early TAs

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

core/arch/arm/kernel/early_ta.c

@@ -28,11 +28,11 @@
 #include <kernel/early_ta.h>
 #include <kernel/linker.h>
 #include <kernel/user_ta.h>
-#include <zlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <trace.h>
 #include <util.h>
+#include <zlib.h>
 
 #include "elf_load.h"
 
@@ -80,9 +80,10 @@ static bool decompression_init(z_stream *strm,
 	strm->zfree = zfree;
 	st = inflateInit(strm);
 	if (st != Z_OK) {
-		DMSG("Early TA decompression initialization error (%d)", st);
+		EMSG("Decompression initialization error (%d)", st);
 		return false;
 	}
+
 	return true;
 }
 
@@ -108,7 +109,6 @@ static TEE_Result early_ta_open(const TEE_UUID *uuid,
 			free(handle);
 			return TEE_ERROR_BAD_FORMAT;
 		}
-
 	}
 	handle->early_ta = ta;
 	*h = handle;
@@ -166,7 +166,7 @@ static TEE_Result read_compressed(struct user_ta_store_handle *h, void *data,
 		strm->avail_out = MIN(len, 1024U);
 		tmpbuf = malloc(strm->avail_out);
 		if (!tmpbuf) {
-			DMSG("Could not allocate temporary buffer");
+			EMSG("Out of memory");
 			return TEE_ERROR_OUT_OF_MEMORY;
 		}
 		strm->next_out = tmpbuf;
@@ -192,14 +192,15 @@ static TEE_Result read_compressed(struct user_ta_store_handle *h, void *data,
 		}
 	} while ((st == Z_OK || st == Z_BUF_ERROR) && (total != len));
 	if (st != Z_OK && st != Z_STREAM_END && st != Z_BUF_ERROR) {
-		DMSG("TA decompression error (%d)", st);
+		EMSG("Decompression error (%d)", st);
 		ret = TEE_ERROR_GENERIC;
 		goto out;
 	}
 	ret = TEE_SUCCESS;
 out:
 	if (!data)
 		free(tmpbuf);
+
 	return ret;
 }
 

scripts/ta_bin_to_c.py

@@ -31,6 +31,7 @@
 import os
 import re
 import uuid
+import zlib
 
 def get_args():
 
@@ -52,7 +53,6 @@ def get_args():
 	return parser.parse_args()
 
 def main():
-	import zlib
 
 	args = get_args();