From 74ad948f43942409c29c600deaa9dd87997f1d0e Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Tue, 18 Sep 2018 13:10:47 +0100 Subject: [PATCH] BL31: Fix warning about BL32 init function The expected value for failure is 0, so the warning only has to be shown in that case. This is the way the TSPD has done it since it was introduced, and the way SPM and OP-TEE do it. Trusty wrongly returns 0 on success. In the case of TLK, the return value of tlkd_init() is passed from the secure world in register X1 when calling the SMC TLK_ENTRY_DONE. Change-Id: I39106d67631ee57f109619f8830bf4b9d96155e6 Signed-off-by: Antonio Nino Diaz --- bl31/bl31_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 5479a4986..4b7f63c21 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -108,10 +108,8 @@ void bl31_main(void) int32_t rc = (*bl32_init)(); - if (rc != 0) { - WARN("BL31: BL32 initialization failed (rc = %d)\n", - rc); - } + if (rc == 0) + WARN("BL31: BL32 initialization failed\n"); } /* * We are ready to enter the next EL. Prepare entry into the image