core: create embedded_ts

Create an embedded ts struct which will encapsulate both early_ta's
and embedded SPs.

Signed-off-by: Jelle Sels <jelle.sels@arm.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>

Author: jellesels-arm

core/arch/arm/include/kernel/early_ta.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, 2020, Linaro Limited
+ * Copyright (c) 2020, Arm Limited.
  */
 #ifndef KERNEL_EARLY_TA_H
 #define KERNEL_EARLY_TA_H
@@ -9,16 +10,8 @@
 #include <stdint.h>
 #include <tee_api_types.h>
 
-struct early_ta {
-	uint32_t flags;
-	TEE_UUID uuid;
-	uint32_t size;
-	uint32_t uncompressed_size; /* 0: not compressed */
-	const uint8_t *ta; /* @size bytes */
-};
-
 #define for_each_early_ta(_ta) \
-	SCATTERED_ARRAY_FOREACH(_ta, early_tas, struct early_ta)
+	SCATTERED_ARRAY_FOREACH(_ta, early_tas, struct embedded_ts)
 
 #endif /* KERNEL_EARLY_TA_H */
 

core/arch/arm/include/kernel/embedded_ts.h

@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+/*
+ * Copyright (c) 2017, Linaro Limited
+ * Copyright (c) 2020, Arm Limited.
+ */
+#ifndef KERNEL_EMBEDDED_TS_H
+#define KERNEL_EMBEDDED_TS_H
+
+#include <compiler.h>
+#include <kernel/linker.h>
+#include <stdint.h>
+#include <tee_api_types.h>
+#include <util.h>
+
+struct embedded_ts {
+	uint32_t flags;
+	TEE_UUID uuid;
+	uint32_t size;
+	uint32_t uncompressed_size; /* 0: not compressed */
+	const uint8_t *ts; /* @size bytes */
+};
+
+#endif /* KERNEL_EMBEDDED_TS_H */
+

core/arch/arm/kernel/early_ta.c

@@ -16,14 +16,14 @@
 #include <zlib.h>
 
 struct ts_store_handle {
-	const struct early_ta *early_ta;
+	const struct embedded_ts *early_ta;
 	size_t offs;
 	z_stream strm;
 };
 
-static const struct early_ta *find_early_ta(const TEE_UUID *uuid)
+static const struct embedded_ts *find_early_ta(const TEE_UUID *uuid)
 {
-	const struct early_ta *ta;
+	const struct embedded_ts *ta = NULL;
 
 	for_each_early_ta(ta)
 		if (!memcmp(&ta->uuid, uuid, sizeof(*uuid)))
@@ -44,11 +44,11 @@ static void zfree(void *opaque __unused, void *address)
 }
 
 static bool decompression_init(z_stream *strm,
-			       const struct early_ta *ta)
+			       const struct embedded_ts *ta)
 {
 	int st;
 
-	strm->next_in = ta->ta;
+	strm->next_in = ta->ts;
 	strm->avail_in = ta->size;
 	strm->zalloc = zalloc;
 	strm->zfree = zfree;
@@ -64,9 +64,9 @@ static bool decompression_init(z_stream *strm,
 static TEE_Result early_ta_open(const TEE_UUID *uuid,
 				struct ts_store_handle **h)
 {
-	struct ts_store_handle *handle;
-	const struct early_ta *ta;
-	bool st;
+	struct ts_store_handle *handle = NULL;
+	const struct embedded_ts *ta = NULL;
+	bool st = Z_OK;
 
 	ta = find_early_ta(uuid);
 	if (!ta)
@@ -92,7 +92,7 @@ static TEE_Result early_ta_open(const TEE_UUID *uuid,
 static TEE_Result early_ta_get_size(const struct ts_store_handle *h,
 				    size_t *size)
 {
-	const struct early_ta *ta = h->early_ta;
+	const struct embedded_ts *ta = h->early_ta;
 
 	if (ta->uncompressed_size)
 		*size = ta->uncompressed_size;
@@ -236,7 +236,7 @@ REGISTER_TA_STORE(2) = {
 
 static TEE_Result early_ta_init(void)
 {
-	const struct early_ta *ta;
+	const struct embedded_ts *ta = NULL;
 	char __maybe_unused msg[60] = { '\0', };
 
 	for_each_early_ta(ta) {

core/pta/device.c

@@ -42,7 +42,7 @@ static TEE_Result get_devices(uint32_t types,
 			      uint32_t rflags)
 {
 	const struct pseudo_ta_head *ta = NULL;
-	const struct early_ta *eta = NULL;
+	const struct embedded_ts *eta = NULL;
 	void *buf = NULL;
 	uint32_t blen = 0;
 	uint32_t pos = 0;