From fbe4dbeec906038795f72d8f9284a812bd6a852d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 20 Feb 2023 13:01:27 +0100 Subject: [PATCH] fix(zynqmp): panic w/o handoff structure in !JTAG In case that FSBL (or SPL) doesn't provide valid handoff structure don't fallback to default image location. In non JTAG boot mode all the time structure should be passed. If it is not it can be opportunity to inject any code to default locations and start it. That's why panic in all these cases. Change-Id: Ib3e11e2ae9ffec7406002cce4997b12b97bdc396 Signed-off-by: Michal Simek --- plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 59f729850..6bc571669 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2013-2021, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2023, Advanced Micro Devices Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -118,9 +119,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, enum fsbl_handoff ret = fsbl_atf_handover(&bl32_image_ep_info, &bl33_image_ep_info, atf_handoff_addr); - if (ret == FSBL_HANDOFF_NO_STRUCT) { - bl31_set_default_config(); - } else if (ret != FSBL_HANDOFF_SUCCESS) { + if (ret != FSBL_HANDOFF_SUCCESS) { panic(); } } -- 2.39.5