xtest: remove CFG_SECSTOR_TA_MGMT_PTA dependency

Android.mk

@@ -53,6 +53,7 @@ srcs +=	adbg/src/adbg_case.c \
 	regression_8000.c \
 	regression_8100.c \
 	hash_perf.c \
+	install_ta.c \
 	stats.c \
 	symm_cipher_perf.c \
 	xtest_helpers.c \
@@ -64,10 +65,6 @@ ifeq ($(CFG_SECURE_PARTITION)-$(CFG_SPMC_TESTS),y-y)
 srcs += ffa_spmc_1000.c
 endif
 
-ifeq ($(CFG_SECSTOR_TA_MGMT_PTA),y)
-srcs += install_ta.c
-endif
-
 ifeq ($(CFG_SECURE_DATA_PATH),y)
 srcs += sdp_basic.c
 endif

host/xtest/CMakeLists.txt

@@ -57,6 +57,7 @@ set (SRC
 	regression_8000.c
 	regression_8100.c
 	hash_perf.c
+	install_ta.c
 	stats.c
 	symm_cipher_perf.c
 	xtest_helpers.c
@@ -101,10 +102,6 @@ if (CFG_GP_SOCKETS)
 	)
 endif()
 
-if (CFG_SECSTOR_TA_MGMT_PTA)
-	list (APPEND SRC install_ta.c)
-endif()
-
 if (CFG_SECURE_DATA_PATH)
 	list (APPEND SRC sdp_basic.c)
 endif()

host/xtest/Makefile

@@ -72,6 +72,7 @@ srcs +=	adbg/src/adbg_case.c \
 	regression_8000.c \
 	regression_8100.c \
 	hash_perf.c \
+	install_ta.c \
 	stats.c \
 	symm_cipher_perf.c \
 	xtest_helpers.c \
@@ -83,10 +84,6 @@ ifeq ($(CFG_SECURE_PARTITION)-$(CFG_SPMC_TESTS),y-y)
 srcs += ffa_spmc_1000.c
 endif
 
-ifeq ($(CFG_SECSTOR_TA_MGMT_PTA),y)
-srcs += install_ta.c
-endif
-
 ifeq ($(CFG_SECURE_DATA_PATH),y)
 srcs += sdp_basic.c
 endif

host/xtest/install_ta.c

@@ -126,6 +126,8 @@ int install_ta_runner_cmd_parser(int argc, char *argv[])
 
 	res = TEEC_OpenSession(&ctx, &sess, &uuid, TEEC_LOGIN_PUBLIC, NULL,
 			       NULL, &err_origin);
+	if (res == TEEC_ERROR_ITEM_NOT_FOUND && err_origin == TEEC_ORIGIN_TEE)
+		errx(1, "TA install is not supported by OP-TEE");
 	if (res)
 		errx(1, "TEEC_OpenSession: res %#" PRIx32 " err_orig %#" PRIx32,
 			res, err_origin);

host/xtest/xtest_main.c

@@ -104,10 +104,8 @@ void usage(char *program)
 	printf("\t--hash-perf [opts] Hash performance testing tool (-h for usage)\n");
 	printf("\t--aes-perf [opts]  AES performance testing tool (-h for usage)\n");
 	printf("\t--asym-perf [opts]  Asym performance testing tool (-h for usage)\n");
-#ifdef CFG_SECSTOR_TA_MGMT_PTA
 	printf("\t--install-ta [directory or list of TAs]\n");
 	printf("\t                   Install TAs\n");
-#endif
 #ifdef CFG_SECURE_DATA_PATH
 	printf("\t--sdp-basic [opts] Basic Secure Data Path test setup ('-h' for usage)\n");
 #endif
@@ -172,10 +170,8 @@ int main(int argc, char *argv[])
 		return aes_perf_runner_cmd_parser(argc-1, &argv[1]);
 	else if (argc > 1 && !strcmp(argv[1], "--asym-perf"))
 		return asym_perf_runner_cmd_parser(argc-1, &argv[1]);
-#ifdef CFG_SECSTOR_TA_MGMT_PTA
 	else if (argc > 1 && !strcmp(argv[1], "--install-ta"))
 		return install_ta_runner_cmd_parser(argc - 1, argv + 1);
-#endif
 #ifdef CFG_SECURE_DATA_PATH
 	else if (argc > 1 && !strcmp(argv[1], "--sdp-basic"))
 		return sdp_basic_runner_cmd_parser(argc-1, &argv[1]);