From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 16 Aug 2022 09:34:07 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oNr5U-000R8T-6c for lore@lore.pengutronix.de; Tue, 16 Aug 2022 09:34:07 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oNr5R-0000yQ-Qj for lore@pengutronix.de; Tue, 16 Aug 2022 09:34:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5QCNreMtFtBtlzF4dKFu6nqG4QTdHxqYuRw+aDEebSc=; b=xl3hoJIX/4JgJ0lB8rF4EWARdq XbrImr/LRgwe3ymsvEyKvAN/W6VMBgfkmeDIopEQtF4id7K/HFGAPpLg3FnGae3AmYOaHY1H7GpSs VJ3gFDynYke7TAYZvBT5YPYhK5XhJgV4oaLwM4CxDL+96JZ2VHXEmlu/SnYJoxZLE+10Atdeya6pL tor0K0VNF/NZdhc8wbSTARJW5T0e6bqlFFk8Eg8sUKeHxrIdL/asYPAYBcqMXwqTm1gGPiB02WFdE jP22nTQ18bxs2YXvfHW/Qt1ef5UD72OzXzgrBDi3Iqgg9b8tmfBD4h+Et2x+SFdw6he0l6anWVHlt XKFok8fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNr3k-00FHkX-Q0; Tue, 16 Aug 2022 07:32:21 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNr2X-00FFdS-59 for barebox@lists.infradead.org; Tue, 16 Aug 2022 07:31:10 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oNr2R-0000PQ-Fq; Tue, 16 Aug 2022 09:30:59 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oNr2Q-0004JI-Oj; Tue, 16 Aug 2022 09:30:58 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oNr2P-000Bu6-UO; Tue, 16 Aug 2022 09:30:57 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: mfe@pengutronix.de, Ahmad Fatoum Date: Tue, 16 Aug 2022 09:30:56 +0200 Message-Id: <20220816073056.45694-3-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816073056.45694-1-a.fatoum@pengutronix.de> References: <20220816073056.45694-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220816_003105_262225_F82C9F56 X-CRM114-Status: GOOD ( 14.42 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 3/3] ARM: i.MX8M: define imx8mX_load_bl33 and imx8mX_load_and_start_tfa X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) For most users imx8mX_load_and_start_tfa saves a good deal of boilerplate. It's not always sufficient though: - board code may need a pointer to bl33 to install other firmware besides barebox proper from there before jumping to bl31 (TF-A). - board code may want to use a different ARM Trusted Firmware, e.g. when OP-TEE is to be installed. Thus define two more helper: imx8mX_load_bl33 and imx8mn_load_and_start_tfa, which allows board code to avoid duplicating the chainload logic and focus on doing the board specific stuff only. Signed-off-by: Ahmad Fatoum --- v1 -> v2: - don't do redundant imx8mX_load_bl33() in imx8m_load_and_start_tfa() (Marco) --- arch/arm/mach-imx/atf.c | 43 ++++++++++++-------------- arch/arm/mach-imx/include/mach/atf.h | 11 +++++++ arch/arm/mach-imx/include/mach/xload.h | 4 +++ 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-imx/atf.c b/arch/arm/mach-imx/atf.c index 675e90792a32..5301c0fbe8e5 100644 --- a/arch/arm/mach-imx/atf.c +++ b/arch/arm/mach-imx/atf.c @@ -70,13 +70,10 @@ __noreturn void imx8mq_atf_load_bl31(const void *fw, size_t fw_size) imx8m_atf_start_bl31(fw, fw_size, (void *)MX8MQ_ATF_BL31_BASE_ADDR); } -__noreturn void imx8mm_load_and_start_image_via_tfa(void) +void imx8mm_load_bl33(void *bl33) { - size_t bl31_size; - const u8 *bl31; enum bootsource src; int instance; - void *bl33 = (void *)MX8M_ATF_BL33_BASE_ADDR; imx8mm_get_boot_source(&src, &instance); switch (src) { @@ -122,16 +119,16 @@ __noreturn void imx8mm_load_and_start_image_via_tfa(void) * the same code in DRAM. */ memcpy(bl33, __image_start, barebox_pbl_size); +} - get_builtin_firmware(imx8mm_bl31_bin, &bl31, &bl31_size); - - imx8mm_atf_load_bl31(bl31, bl31_size); +__noreturn void imx8mm_load_and_start_image_via_tfa(void) +{ + imx8mm_load_bl33((void *)MX8M_ATF_BL33_BASE_ADDR); + imx8mm_load_and_start_tfa(imx8mm_bl31_bin); } -__noreturn void imx8mp_load_and_start_image_via_tfa(void) +void imx8mp_load_bl33(void *bl33) { - size_t bl31_size; - const u8 *bl31; enum bootsource src; int instance; @@ -157,18 +154,17 @@ __noreturn void imx8mp_load_and_start_image_via_tfa(void) * for the piggy data, so we need to ensure that we are running * the same code in DRAM. */ - memcpy((void *)MX8M_ATF_BL33_BASE_ADDR, - __image_start, barebox_pbl_size); - - get_builtin_firmware(imx8mp_bl31_bin, &bl31, &bl31_size); + memcpy(bl33, __image_start, barebox_pbl_size); +} - imx8mp_atf_load_bl31(bl31, bl31_size); +void imx8mp_load_and_start_image_via_tfa(void) +{ + imx8mp_load_bl33((void *)MX8M_ATF_BL33_BASE_ADDR); + imx8mp_load_and_start_tfa(imx8mp_bl31_bin); } -__noreturn void imx8mn_load_and_start_image_via_tfa(void) +void imx8mn_load_bl33(void *bl33) { - size_t bl31_size; - const u8 *bl31; enum bootsource src; int instance; @@ -194,10 +190,11 @@ __noreturn void imx8mn_load_and_start_image_via_tfa(void) * for the piggy data, so we need to ensure that we are running * the same code in DRAM. */ - memcpy((void *)MX8M_ATF_BL33_BASE_ADDR, - __image_start, barebox_pbl_size); - - get_builtin_firmware(imx8mn_bl31_bin, &bl31, &bl31_size); + memcpy(bl33, __image_start, barebox_pbl_size); +} - imx8mn_atf_load_bl31(bl31, bl31_size); +void imx8mn_load_and_start_image_via_tfa(void) +{ + imx8mn_load_bl33((void *)MX8M_ATF_BL33_BASE_ADDR); + imx8mn_load_and_start_tfa(imx8mn_bl31_bin); } diff --git a/arch/arm/mach-imx/include/mach/atf.h b/arch/arm/mach-imx/include/mach/atf.h index ca54bb5fbf82..aed294def9ad 100644 --- a/arch/arm/mach-imx/include/mach/atf.h +++ b/arch/arm/mach-imx/include/mach/atf.h @@ -23,4 +23,15 @@ void __noreturn imx8mn_atf_load_bl31(const void *fw, size_t fw_size); void __noreturn imx8mp_atf_load_bl31(const void *fw, size_t fw_size); void __noreturn imx8mq_atf_load_bl31(const void *fw, size_t fw_size); +#define imx8m_load_and_start_tfa(soc,fw_name) do { \ + size_t __bl31_size; \ + const u8 *__bl31; \ + get_builtin_firmware(fw_name, &__bl31, &__bl31_size); \ + soc##_atf_load_bl31(__bl31, __bl31_size); \ +} while (0) + +#define imx8mm_load_and_start_tfa(fw_name) imx8m_load_and_start_tfa(imx8mm, fw_name) +#define imx8mn_load_and_start_tfa(fw_name) imx8m_load_and_start_tfa(imx8mn, fw_name) +#define imx8mp_load_and_start_tfa(fw_name) imx8m_load_and_start_tfa(imx8mp, fw_name) + #endif diff --git a/arch/arm/mach-imx/include/mach/xload.h b/arch/arm/mach-imx/include/mach/xload.h index fe43d2502632..82bf663c4266 100644 --- a/arch/arm/mach-imx/include/mach/xload.h +++ b/arch/arm/mach-imx/include/mach/xload.h @@ -16,6 +16,10 @@ int imx8m_esdhc_load_image(int instance, bool start); int imx8mn_esdhc_load_image(int instance, bool start); int imx8mp_esdhc_load_image(int instance, bool start); +void imx8mm_load_bl33(void *bl33); +void imx8mn_load_bl33(void *bl33); +void imx8mp_load_bl33(void *bl33); + void __noreturn imx8mm_load_and_start_image_via_tfa(void); void __noreturn imx8mn_load_and_start_image_via_tfa(void); void __noreturn imx8mp_load_and_start_image_via_tfa(void); -- 2.30.2