From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 10 Nov 2025 21:35:46 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vIYc6-00HVN2-0y for lore@lore.pengutronix.de; Mon, 10 Nov 2025 21:35:46 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vIYc3-0002HN-OH for lore@pengutronix.de; Mon, 10 Nov 2025 21:35:46 +0100 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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VzAgks76L953xkYsZvmBUfex6NhhEt9icKeMqHowvQM=; b=m0F6E4537OEr5UhNL3Jf2obaJV 6lwj5SNYx/9ShlYiQSGmdSyEeof6zJ9iGX2X5oOGu5Xa05lbjxV/vYZKNuVzwUEKqsOvGpmfBJBXC vIob9/x4CtHh1iRHvp66mU+kQ4S6qWyHv3y5KVFz1fjELYivNasMZGadqufLJhaN8UuE1IJMQMmOv hq/orzumXGEORGYmQofUVvtPmAHBdBxLPl8/nuoiHQdQO8bUydYcmhvQRKrRfk2Y35lXLRJ9BbTqs /3OmHtsDuYLYyrfaQ8TbYt/GvASA9bg963fMZ0kOuOEnqWJVsG92bi+lPBNn8BApku3fRUYfs3bh3 QtBNQhsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vIYbK-000000065cF-16i3; Mon, 10 Nov 2025 20:34:58 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vIYbB-000000065SE-3GdA for barebox@lists.infradead.org; Mon, 10 Nov 2025 20:34:53 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vIYb8-0001MT-Iq; Mon, 10 Nov 2025 21:34:46 +0100 From: Marco Felsch Date: Mon, 10 Nov 2025 21:34:45 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251110-v2025-09-0-topic-optee-of-handling-v1-5-8f0625ac5471@pengutronix.de> References: <20251110-v2025-09-0-topic-optee-of-handling-v1-0-8f0625ac5471@pengutronix.de> In-Reply-To: <20251110-v2025-09-0-topic-optee-of-handling-v1-0-8f0625ac5471@pengutronix.de> To: Sascha Hauer , BAREBOX Cc: Marco Felsch X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251110_123449_837018_0BD5F26B X-CRM114-Status: GOOD ( 10.86 ) 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.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 05/23] ARM: i.MX8M: cosmetic cleanup X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Rename the local imx8m_atf_start_bl31() to imx8m_tfa_start_bl31() since the official naming is Trusted-Firmware A (TF-A) and not ARM Trusted Firmware which was the former name. While on it rename the parameters to make it clear what firmware component is passed and align the function documentation with the reality. Signed-off-by: Marco Felsch --- arch/arm/mach-imx/atf.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-imx/atf.c b/arch/arm/mach-imx/atf.c index 42ab9e9a23e433c50a1df1739d0163049174e6a6..dd861f1ad87c98c8baffa2986aeef40eacedc88c 100644 --- a/arch/arm/mach-imx/atf.c +++ b/arch/arm/mach-imx/atf.c @@ -19,11 +19,11 @@ #include /** - * imx8m_atf_load_bl31 - Load ATF BL31 blob and transfer control to it + * imx8m_tfa_start_bl31 - Load TF-A BL31 blob and transfer control to it * - * @fw: Pointer to the BL31 blob - * @fw_size: Size of the BL31 blob - * @atf_dest: Place where the BL31 is copied to and executed + * @tfa: Pointer to the BL31 blob + * @tfa_size: Size of the BL31 blob + * @tfa_dest: Place where the BL31 is copied to and executed * * This function: * @@ -37,12 +37,12 @@ * 3. Transfers control to BL31 */ -static __noreturn void imx8m_atf_start_bl31(const void *fw, size_t fw_size, void *atf_dest) +static __noreturn void imx8m_tfa_start_bl31(const void *tfa_bin, size_t tfa_size, void *tfa_dest) { - void __noreturn (*bl31)(void) = atf_dest; + void __noreturn (*bl31)(void) = tfa_dest; int ret; - BUG_ON(fw_size > MX8M_ATF_BL31_SIZE_LIMIT); + BUG_ON(tfa_size > MX8M_ATF_BL31_SIZE_LIMIT); if (IS_ENABLED(CONFIG_FSL_CAAM_RNG_PBL_INIT)) { ret = imx_early_caam_init(MX8M_CAAM_BASE_ADDR); @@ -52,10 +52,10 @@ static __noreturn void imx8m_atf_start_bl31(const void *fw, size_t fw_size, void pr_debug("CAAM early init successful\n"); } - memcpy(bl31, fw, fw_size); + memcpy(bl31, tfa_bin, tfa_size); asm volatile("msr sp_el2, %0" : : - "r" (atf_dest - 16) : + "r" (tfa_dest - 16) : "cc"); bl31(); __builtin_unreachable(); @@ -176,7 +176,7 @@ __noreturn void __imx8mm_load_and_start_image_via_tfa(void *fdt, void *bl33) get_builtin_firmware(imx8mm_bl31_bin, &bl31, &bl31_size); } - imx8m_atf_start_bl31(bl31, bl31_size, (void *)MX8MM_ATF_BL31_BASE_ADDR); + imx8m_tfa_start_bl31(bl31, bl31_size, (void *)MX8MM_ATF_BL31_BASE_ADDR); } void imx8mp_load_bl33(void *bl33) @@ -250,10 +250,9 @@ __noreturn void __imx8mp_load_and_start_image_via_tfa(void *fdt, void *bl33) get_builtin_firmware(imx8mp_bl31_bin, &bl31, &bl31_size); } - imx8m_atf_start_bl31(bl31, bl31_size, (void *)MX8MP_ATF_BL31_BASE_ADDR); + imx8m_tfa_start_bl31(bl31, bl31_size, (void *)MX8MP_ATF_BL31_BASE_ADDR); } - void imx8mn_load_bl33(void *bl33) { enum bootsource src; @@ -325,7 +324,7 @@ __noreturn void __imx8mn_load_and_start_image_via_tfa(void *fdt, void *bl33) get_builtin_firmware(imx8mn_bl31_bin, &bl31, &bl31_size); } - imx8m_atf_start_bl31(bl31, bl31_size, (void *)MX8MN_ATF_BL31_BASE_ADDR); + imx8m_tfa_start_bl31(bl31, bl31_size, (void *)MX8MN_ATF_BL31_BASE_ADDR); } void imx8mq_load_bl33(void *bl33) @@ -393,7 +392,7 @@ __noreturn void __imx8mq_load_and_start_image_via_tfa(void *fdt, void *bl33) get_builtin_firmware(imx8mq_bl31_bin, &bl31, &bl31_size); } - imx8m_atf_start_bl31(bl31, bl31_size, (void *)MX8MQ_ATF_BL31_BASE_ADDR); + imx8m_tfa_start_bl31(bl31, bl31_size, (void *)MX8MQ_ATF_BL31_BASE_ADDR); } void __noreturn imx93_load_and_start_image_via_tfa(void) -- 2.47.3