From ebb903de26839669c6973a0d0541be9331ccaf4d Mon Sep 17 00:00:00 2001 From: Rajkumar Ayyasamy Date: Tue, 10 Mar 2020 16:17:56 +0530 Subject: [PATCH] ipq: tzt: add scm call return value check Change-Id: Ic7736482a77cbf2eb08e7348ce955a5d0c1cbe37 Signed-off-by: Rajkumar Ayyasamy --- board/qca/arm/common/cmd_tzt.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/board/qca/arm/common/cmd_tzt.c b/board/qca/arm/common/cmd_tzt.c index 4dc8d8460d..10e943f63a 100644 --- a/board/qca/arm/common/cmd_tzt.c +++ b/board/qca/arm/common/cmd_tzt.c @@ -117,6 +117,7 @@ static int do_tzt(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) u32 img_addr; u32 img_size; u32 args[MAX_QCA_SCM_ARGS + 1]; + int ret; /* at least two arguments should be there */ if (argc < 2) @@ -133,15 +134,24 @@ static int do_tzt(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) args[0] = QCA_SCM_ARGS(2, SCM_IO_WRITE); args[1] = TZT_LOAD_ADDR; args[2] = TZT_LOAD_SIZE; - qca_scm(SCM_SVC_APP_MGR, REGION_NOTIFICATION_ID, + ret = qca_scm(SCM_SVC_APP_MGR, REGION_NOTIFICATION_ID, SCM_OWNR_QSEE_OS, args, 3); + if (ret) { + printf("tzt load failed ret = %d\n", ret); + return -1; + } args[0] = QCA_SCM_ARGS(3); args[1] = MDT_SIZE; args[2] = img_size - MDT_SIZE; args[3] = img_addr; - qca_scm(SCM_SVC_EXTERNAL, LOAD_TZTESTEXEC_IMG_ID, + ret = qca_scm(SCM_SVC_EXTERNAL, LOAD_TZTESTEXEC_IMG_ID, SCM_OWNR_QSEE_OS, args, 4); + if (ret) { + printf("tzt load failed ret = %d\n", ret); + return -1; + } + tzt_loaded = 1; return 0; }