| Message ID | 20240423163205.5885-1-gyorgy.szing@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/9] arm/trusted-services: Update FFA TEE driver to v2.0.0 | expand |
On Tue, 23 Apr 2024 18:31:57 +0200, Gyorgy Szing wrote: > - Update driver version to v2.0.0 > - Follow up the name change. The driver has been renamed from > arm_ffa_tee to arm_tstee. > > Applied, thanks! [1/9] arm/trusted-services: Update FFA TEE driver to v2.0.0 commit: 97be7e3fa3175dfb05fb82e4dc8b6f3b756326b9 [2/9] arm/trusted-services: Update TS to v1.0.0 commit: 954975813ac7759ffab9760446f176930d90d29c [3/9] arm/trusted-services: fix MbedTLS build issue commit: 7f30d19df1f5fef12639b909ffb1482fbbcce40d [4/9] arm/trusted-services: fix environment handling commit: 34f1c740923fc9eda6732c74d63f4d624f49dce2 [5/9] arm/devtools/fvp-base-a-aem: update the AEM FVP to 11.25.15 commit: a130541e92578eaee7cbe8a1e4ade9b48b134a15 [6/9] arm-bsp: enable Trusted Services on the fvp-base platform commit: eeb6441ac6a254a43b2a3ac7306e5e7430ba2e37 [7/9] arm-bsp/u-boot: corstone1000: update TS RPC protocol commit: ecb0b05148718695da76a3450c1ff6fe6cae6981 [8/9] arm-bsp/trusted-services: rebase corstone1000 patches commit: 75d6fc191656636b93962f34a1f37113c57d6196 [9/9] arm-bsp/trusted-services:cs1000: fix deployments commit: a1b5347b391b640c3bb7b329acc126fa8af4a4f4 Best regards,
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"