From: Marco Felsch <m.felsch@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 10/18] optee: add helper functions to set/get the optee memory base
Date: Thu, 11 Jan 2024 12:48:33 +0100 [thread overview]
Message-ID: <20240111114841.2676939-11-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20240111114841.2676939-1-m.felsch@pengutronix.de>
Provide helper functions to set/get the optee memory base address
gathered previously from the builtin optee binary header.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
common/optee.c | 27 +++++++++++++++++++++++++++
include/tee/optee.h | 2 ++
2 files changed, 29 insertions(+)
diff --git a/common/optee.c b/common/optee.c
index 6a8084839619..2ae28b172bbb 100644
--- a/common/optee.c
+++ b/common/optee.c
@@ -6,8 +6,13 @@
#include <linux/printk.h>
#include <linux/errno.h>
+static u64 optee_membase = U64_MAX;
+
int optee_verify_header(struct optee_header *hdr)
{
+ if (!hdr)
+ return -EINVAL;
+
if (hdr->magic != OPTEE_MAGIC) {
pr_err("Invalid header magic 0x%08x, expected 0x%08x\n",
hdr->magic, OPTEE_MAGIC);
@@ -32,3 +37,25 @@ int optee_verify_header(struct optee_header *hdr)
return 0;
}
+
+int optee_get_membase(u64 *membase)
+{
+ if (optee_membase == U64_MAX)
+ return -EINVAL;
+
+ *membase = optee_membase;
+
+ return 0;
+}
+
+void optee_set_membase(const struct optee_header *hdr)
+{
+ int ret;
+
+ ret = optee_verify_header(hdr);
+ if (ret)
+ return;
+
+ optee_membase = (u64)hdr->init_load_addr_hi << 32;
+ optee_membase |= hdr->init_load_addr_lo;
+}
diff --git a/include/tee/optee.h b/include/tee/optee.h
index b5ba0a71d7c9..7bd6638f8559 100644
--- a/include/tee/optee.h
+++ b/include/tee/optee.h
@@ -32,6 +32,8 @@ struct optee_header {
};
int optee_verify_header (struct optee_header *hdr);
+void optee_set_membase(const struct optee_header *hdr);
+int optee_get_membase(u64 *membase);
#ifdef __PBL__
--
2.39.2
next prev parent reply other threads:[~2024-01-11 11:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 11:48 [PATCH 00/18] Dynamic OP-TEE Loading Marco Felsch
2024-01-11 11:48 ` [PATCH 01/18] ARM: i.MX8M: atf: make use of imx8m*_save_bootrom_log macros Marco Felsch
2024-01-11 12:06 ` Ahmad Fatoum
2024-01-11 12:16 ` Marco Felsch
2024-01-11 15:28 ` Ahmad Fatoum
2024-01-11 11:48 ` [PATCH 02/18] ARM: i.MX8M: bundle imx-scratch code Marco Felsch
2024-01-11 11:48 ` [PATCH 03/18] ARM: i.MX8M: scratch: make imx_scratch_space private Marco Felsch
2024-01-11 11:48 ` [PATCH 04/18] ARM: i.MX8M: romapi: refactor saving the bootrom log Marco Felsch
2024-01-11 11:48 ` [PATCH 05/18] ARM: i.MX8M: scratch: add optee_hdr area Marco Felsch
2024-01-11 11:48 ` [PATCH 06/18] common: limit BOOTM_OPTEE to 32bit systems Marco Felsch
2024-01-11 11:48 ` [PATCH 07/18] common: add OPTEE_SHM_SIZE to configure optee shared memory Marco Felsch
2024-01-11 13:24 ` Marco Felsch
2024-01-11 11:48 ` [PATCH 08/18] optee: add support to verify 64-bit headers as well Marco Felsch
2024-01-11 11:48 ` [PATCH 09/18] optee: add header version check Marco Felsch
2024-01-11 11:48 ` Marco Felsch [this message]
2024-01-11 11:48 ` [PATCH 11/18] optee: optee_verify_header: constify optee_header Marco Felsch
2024-01-11 11:48 ` [PATCH 12/18] ARM64: mmu: add dynamic optee memory mapping support Marco Felsch
2024-01-11 12:07 ` Ahmad Fatoum
2024-01-11 12:14 ` Marco Felsch
2024-01-11 15:25 ` Ahmad Fatoum
2024-01-11 11:48 ` [PATCH 13/18] ARM: i.MX8M: add dynamic optee memory of-fixup support Marco Felsch
2024-01-11 11:48 ` [PATCH 14/18] drivers: tee: optee: add support for dynamic optee memory base address Marco Felsch
2024-01-11 11:48 ` [PATCH 15/18] ARM: i.MX8M: atf: add support for optee hdr parsing Marco Felsch
2024-01-11 11:48 ` [PATCH 16/18] ARM: i.MX8M: allow board code to configure the bl33 loadaddr Marco Felsch
2024-01-11 11:48 ` [PATCH 17/18] ARM: i.MX8M: cleanup MX8M*_ATF_BL33_BASE_ADDR defines Marco Felsch
2024-01-11 11:48 ` [PATCH 18/18] ARM: i.MX8M: fix optee of-fixup logic Marco Felsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240111114841.2676939-11-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox