[fix-up] core: pta: add self tests for transfer list

Misc fixes to address review comments.

Signed-off-by: Raymond Mao <raymond.mao@linaro.org>

Author: raymo200915

core/pta/tests/invoke.c

@@ -433,10 +433,8 @@ static TEE_Result invoke_command(void *pSessionContext __unused,
 		return core_aes_perf_tests(nParamTypes, pParams);
 	case PTA_INVOKE_TESTS_CMD_DT_DRIVER_TESTS:
 		return core_dt_driver_tests(nParamTypes, pParams);
-#if defined(CFG_TRANSFER_LIST_TEST)
 	case PTA_INVOKE_TESTS_CMD_TRANSFER_LIST_TESTS:
 		return core_transfer_list_tests(nParamTypes, pParams);
-#endif
 	default:
 		break;
 	}

core/pta/tests/misc.h

@@ -37,7 +37,16 @@ TEE_Result core_aes_perf_tests(uint32_t param_types,
 TEE_Result core_dt_driver_tests(uint32_t param_types,
 				TEE_Param params[TEE_NUM_PARAMS]);
 
+#if defined(CFG_TRANSFER_LIST_TEST)
 TEE_Result core_transfer_list_tests(uint32_t nParamTypes,
 				    TEE_Param pParams[TEE_NUM_PARAMS]);
+#else
+static inline TEE_Result
+core_transfer_list_tests(uint32_t nParamTypes __unused,
+			 TEE_Param pParams[TEE_NUM_PARAMS] __unused)
+{
+	return TEE_ERROR_NOT_SUPPORTED;
+}
+#endif
 
 #endif /*CORE_PTA_TESTS_MISC_H*/

core/pta/tests/transfer_list.c

@@ -4,7 +4,8 @@
  */
 
 #include <kernel/transfer_list.h>
-#include <mm/core_memprot.h>
+#include <mm/core_mmu.h>
+#include <mm/phys_mem.h>
 #include <pta_invoke_tests.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,13 +29,12 @@ static TEE_Result test_add_te(struct transfer_list_header *tl,
 			      const void *data, uint8_t align,
 			      struct transfer_list_entry **tle)
 {
-	uint8_t *te_dat;
-	bool new_max_align = false;
+	uint8_t *te_dat = NULL;
+	uint8_t old_tl_align = 0;
 	vaddr_t old_tl_ev = (vaddr_t)tl + tl->size;
-	struct transfer_list_entry *tl_e;
+	struct transfer_list_entry *tl_e = NULL;
 
-	if (align > tl->alignment)
-		new_max_align = true;
+	old_tl_align = tl->alignment;
 
 	if (!align)
 		tl_e = transfer_list_add(tl, tag_id, data_size, data);
@@ -45,8 +45,7 @@ static TEE_Result test_add_te(struct transfer_list_header *tl,
 	if (!tl_e)
 		return TEE_ERROR_GENERIC;
 
-	/* tl->alignment keeps the max entry data alignment of the TL */
-	if (new_max_align && tl->alignment != align)
+	if (tl->alignment != MAX(old_tl_align, align))
 		return TEE_ERROR_CORRUPT_OBJECT;
 
 	if (tl_e->tag_id != tag_id || tl_e->hdr_size != sizeof(*tl_e) ||
@@ -87,7 +86,7 @@ static TEE_Result test_add_te(struct transfer_list_header *tl,
 static TEE_Result test_rm_te(struct transfer_list_header *tl,
 			     uint16_t tag_id)
 {
-	struct transfer_list_entry *tl_e;
+	struct transfer_list_entry *tl_e = NULL;
 
 	tl_e = transfer_list_find(tl, tag_id);
 	if (!tl_e)
@@ -109,9 +108,9 @@ static TEE_Result test_set_te_data_size(struct transfer_list_header *tl,
 					struct transfer_list_entry *tl_e,
 					uint32_t new_data_size)
 {
-	struct transfer_list_entry *old_te_next;
-	struct transfer_list_entry *new_te_next;
-	size_t mov_dis;
+	struct transfer_list_entry *old_te_next = NULL;
+	struct transfer_list_entry *new_te_next = NULL;
+	size_t mov_dis = 0;
 
 	old_te_next = transfer_list_next(tl, tl_e);
 
@@ -144,20 +143,16 @@ static TEE_Result test_set_te_data_size(struct transfer_list_header *tl,
 
 static TEE_Result transfer_list_tests(void)
 {
-	uint8_t *va_tl;
-	paddr_t pa_tl;
-	struct transfer_list_header *tl;
-	struct transfer_list_entry *te1, *te2, *te3;
-	TEE_Result ret;
-
-	va_tl = memalign(TL_ALIGNMENT_FROM_ORDER(TRANSFER_LIST_INIT_MAX_ALIGN),
-			 TEST_TL_MAX_SIZE);
-	if (!va_tl)
-		return TEE_ERROR_OUT_OF_MEMORY;
+	struct transfer_list_header *tl = NULL;
+	struct transfer_list_entry *te1 = NULL, *te2 = NULL, *te3 = NULL;
+	TEE_Result ret = TEE_SUCCESS;
+	tee_mm_entry_t *mm = NULL;
 
-	pa_tl = virt_to_phys(va_tl);
+	mm = phys_mem_core_alloc(SMALL_PAGE_SIZE);
+	if (!mm)
+		return TEE_ERROR_OUT_OF_MEMORY;
 
-	tl = transfer_list_init(pa_tl, TEST_TL_MAX_SIZE);
+	tl = transfer_list_init(tee_mm_get_smem(mm), TEST_TL_MAX_SIZE);
 	if (!tl) {
 		ret = TEE_ERROR_GENERIC;
 		goto free_tl;
@@ -232,7 +227,7 @@ static TEE_Result transfer_list_tests(void)
 	transfer_list_unmap_sync(tl);
 
 free_tl:
-	free(va_tl);
+	tee_mm_free(mm);
 	return ret;
 }