From: Gyorgy Szing <gyorgy.szing@arm.com>
To: meta-arm@lists.yoctoproject.org
Cc: Gyorgy Szing <Gyorgy.Szing@arm.com>
Subject: [PATCH 1/9] arm/trusted-services: Update FFA TEE driver to v2.0.0
Date: Tue, 23 Apr 2024 18:31:57 +0200 [thread overview]
Message-ID: <20240423163205.5885-1-gyorgy.szing@arm.com> (raw)
From: Gyorgy Szing <Gyorgy.Szing@arm.com>
- Update driver version to v2.0.0
- Follow up the name change. The driver has been renamed from
arm_ffa_tee to arm_tstee.
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
---
documentation/trusted-services.md | 2 +-
meta-arm-bsp/documentation/corstone1000/user-guide.rst | 6 +++---
.../arm-ffa-tee_1.1.2.bb => arm-tstee/arm-tstee_2.0.0.bb} | 8 ++++----
.../{arm-ffa-tee => arm-tstee}/files/Makefile | 2 +-
meta-arm/recipes-security/trusted-services/libts_git.bb | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
rename meta-arm/recipes-kernel/{arm-ffa-tee/arm-ffa-tee_1.1.2.bb => arm-tstee/arm-tstee_2.0.0.bb} (74%)
rename meta-arm/recipes-kernel/{arm-ffa-tee => arm-tstee}/files/Makefile (92%)
diff --git a/documentation/trusted-services.md b/documentation/trusted-services.md
index 70826f68..a3732713 100644
--- a/documentation/trusted-services.md
+++ b/documentation/trusted-services.md
@@ -28,7 +28,7 @@ Other steps depend on your machine/platform definition:
1. For communications between Secure and Normal Words Linux kernel option `CONFIG_ARM_FFA_TRANSPORT=y`
is required. If your platform doesn't include it already you can add `arm-ffa` into MACHINE_FEATURES.
- (Please see ` meta-arm/recipes-kernel/arm-ffa-tee`.)
+ (Please see ` meta-arm/recipes-kernel/arm-tstee`.)
For running the `uefi-test` or the `xtest -t ffa_spmc` tests under Linux the `arm-ffa-user` drivel is required. This is
enabled if the `ts-smm-gateway` and/or the `optee-spmc-test` machine features are enabled.
diff --git a/meta-arm-bsp/documentation/corstone1000/user-guide.rst b/meta-arm-bsp/documentation/corstone1000/user-guide.rst
index 06353b5d..073ea213 100644
--- a/meta-arm-bsp/documentation/corstone1000/user-guide.rst
+++ b/meta-arm-bsp/documentation/corstone1000/user-guide.rst
@@ -1295,19 +1295,19 @@ First, load FF-A TEE kernel module:
::
- insmod /lib/modules/*-yocto-standard/updates/arm-ffa-tee.ko
+ insmod /lib/modules/6.1.32-yocto-standard/extra/arm-tstee.ko
Then, check whether the FF-A TEE driver is loaded correctly by using the following command:
::
- cat /proc/modules | grep arm_ffa_tee
+ cat /proc/modules | grep arm_tstee
The output should be:
::
- arm_ffa_tee <ID> - - Live <address> (O)
+ arm_tstee 16384 - - Live 0xffffffc000510000 (O)
Now, run the PSA API tests in the following order:
diff --git a/meta-arm/recipes-kernel/arm-ffa-tee/arm-ffa-tee_1.1.2.bb b/meta-arm/recipes-kernel/arm-tstee/arm-tstee_2.0.0.bb
similarity index 74%
rename from meta-arm/recipes-kernel/arm-ffa-tee/arm-ffa-tee_1.1.2.bb
rename to meta-arm/recipes-kernel/arm-tstee/arm-tstee_2.0.0.bb
index 5790d00f..44608b1d 100644
--- a/meta-arm/recipes-kernel/arm-ffa-tee/arm-ffa-tee_1.1.2.bb
+++ b/meta-arm/recipes-kernel/arm-tstee/arm-tstee_2.0.0.bb
@@ -10,13 +10,13 @@ SRC_URI = "git://gitlab.arm.com/linux-arm/linux-trusted-services;protocol=https;
"
S = "${WORKDIR}/git"
-# Tag tee-v1.1.2
-SRCREV = "8a81f5d2406f146b15a705d49b256efaa5fa3ba9"
+# Tag tee-v2.0.0
+SRCREV = "a2d7349a96c3b3afb44bf1555d53f1c46e45a23d"
COMPATIBLE_HOST = "(arm|aarch64).*-linux"
-KERNEL_MODULE_AUTOLOAD += "arm-ffa-tee"
+KERNEL_MODULE_AUTOLOAD += "arm-tstee"
do_install:append() {
install -d ${D}${includedir}
- install -m 0644 ${S}/uapi/arm_ffa_tee.h ${D}${includedir}/
+ install -m 0644 ${S}/uapi/arm_tstee.h ${D}${includedir}/
}
diff --git a/meta-arm/recipes-kernel/arm-ffa-tee/files/Makefile b/meta-arm/recipes-kernel/arm-tstee/files/Makefile
similarity index 92%
rename from meta-arm/recipes-kernel/arm-ffa-tee/files/Makefile
rename to meta-arm/recipes-kernel/arm-tstee/files/Makefile
index 40a6e474..6d781d15 100644
--- a/meta-arm/recipes-kernel/arm-ffa-tee/files/Makefile
+++ b/meta-arm/recipes-kernel/arm-tstee/files/Makefile
@@ -1,4 +1,4 @@
-obj-m := arm-ffa-tee.o
+obj-m := arm-tstee.o
SRC := $(shell pwd)
diff --git a/meta-arm/recipes-security/trusted-services/libts_git.bb b/meta-arm/recipes-security/trusted-services/libts_git.bb
index aafe8516..789bde7c 100644
--- a/meta-arm/recipes-security/trusted-services/libts_git.bb
+++ b/meta-arm/recipes-security/trusted-services/libts_git.bb
@@ -10,8 +10,8 @@ SRC_URI += "file://tee-udev.rules \
OECMAKE_SOURCEPATH="${S}/deployments/libts/${TS_ENV}"
-DEPENDS += "arm-ffa-tee arm-ffa-user"
-RRECOMMENDS:${PN} += "arm-ffa-tee"
+DEPENDS += "arm-tstee arm-ffa-user"
+RRECOMMENDS:${PN} += "arm-tstee"
# Unix group name for dev/tee* ownership.
TEE_GROUP_NAME ?= "teeclnt"
--
2.43.1
next reply other threads:[~2024-04-23 16:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 16:31 Gyorgy Szing [this message]
2024-04-23 16:31 ` [PATCH 2/9] arm/trusted-services: Update TS to v1.0.0 Gyorgy Szing
2024-04-23 16:31 ` [PATCH 3/9] arm/trusted-services: fix MbedTLS build issue Gyorgy Szing
2024-04-23 16:32 ` [PATCH 4/9] arm/trusted-services: fix environment handling Gyorgy Szing
2024-04-23 16:32 ` [PATCH 5/9] arm/devtools/fvp-base-a-aem: update the AEM FVP to 11.25.15 Gyorgy Szing
2024-04-23 16:32 ` [PATCH 6/9] arm-bsp: enable Trusted Services on the fvp-base platform Gyorgy Szing
2024-04-23 16:32 ` [PATCH 7/9] arm-bsp/u-boot: corstone1000: update TS RPC protocol Gyorgy Szing
2024-04-23 16:32 ` [PATCH 8/9] arm-bsp/trusted-services: rebase corstone1000 patches Gyorgy Szing
2024-04-23 16:32 ` [PATCH 9/9] arm-bsp/trusted-services:cs1000: fix deployments Gyorgy Szing
2024-04-24 14:12 ` [PATCH 1/9] arm/trusted-services: Update FFA TEE driver to v2.0.0 Jon Mason
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=20240423163205.5885-1-gyorgy.szing@arm.com \
--to=gyorgy.szing@arm.com \
--cc=meta-arm@lists.yoctoproject.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).