mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marco Felsch <m.felsch@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 14/18] drivers: tee: optee: add support for dynamic optee memory base address
Date: Thu, 11 Jan 2024 12:48:37 +0100	[thread overview]
Message-ID: <20240111114841.2676939-15-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20240111114841.2676939-1-m.felsch@pengutronix.de>

Make use of the platform provided optee memory base address. Fallback to
the current behaviour if the platform doesn't provide the optee memory
base.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 drivers/tee/optee/of.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/tee/optee/of.c b/drivers/tee/optee/of.c
index 8295a1751c52..cdf650592e90 100644
--- a/drivers/tee/optee/of.c
+++ b/drivers/tee/optee/of.c
@@ -4,12 +4,14 @@
 #include <linux/ioport.h>
 #include <asm/barebox-arm.h>
 #include <asm/optee.h>
+#include <tee/optee.h>
 
 int of_optee_fixup(struct device_node *root, void *_data)
 {
 	struct of_optee_fixup_data *fixup_data = _data;
 	struct resource res = {};
 	struct device_node *node;
+	u64 optee_membase;
 	int ret;
 
 	node = of_create_node(root, "/firmware/optee");
@@ -24,8 +26,13 @@ int of_optee_fixup(struct device_node *root, void *_data)
 	if (ret)
 		return ret;
 
-	res.start = arm_mem_endmem_get() - OPTEE_SIZE;
-	res.end = arm_mem_endmem_get() - fixup_data->shm_size -1;
+	if (!optee_get_membase(&optee_membase)) {
+		res.start = optee_membase;
+		res.end = optee_membase + OPTEE_SIZE - fixup_data->shm_size - 1;
+	} else {
+		res.start = arm_mem_endmem_get() - OPTEE_SIZE;
+		res.end = arm_mem_endmem_get() - fixup_data->shm_size - 1;
+	}
 	res.flags = IORESOURCE_BUSY;
 	res.name = "optee_core";
 
@@ -33,8 +40,13 @@ int of_optee_fixup(struct device_node *root, void *_data)
 	if (ret)
 		return ret;
 
-	res.start = arm_mem_endmem_get() - fixup_data->shm_size;
-	res.end = arm_mem_endmem_get() - 1;
+	if (!optee_get_membase(&optee_membase)) {
+		res.start = optee_membase + OPTEE_SIZE - fixup_data->shm_size;
+		res.end = optee_membase + OPTEE_SIZE - 1;
+	} else {
+		res.start = arm_mem_endmem_get() - fixup_data->shm_size;
+		res.end = arm_mem_endmem_get() - 1;
+	}
 	res.flags &= ~IORESOURCE_BUSY;
 	res.name = "optee_shm";
 
-- 
2.39.2




  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 ` [PATCH 10/18] optee: add helper functions to set/get the optee memory base Marco Felsch
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 ` Marco Felsch [this message]
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-15-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