new file mode 100644
@@ -0,0 +1,44 @@
+From ea9556a14bec0249ac6e01e4a55cbb04fd15b51a Mon Sep 17 00:00:00 2001
+From: Rupinderjit Singh <rupinderjit.singh@arm.com>
+Date: Wed, 27 Jul 2022 09:23:58 +0100
+Subject: [PATCH] feat(arm/tc): Update trusty load-address in dts files.
+
+Change is required to align with sp header size change from 0x1000 to 0x4000
+
+Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com>
+Change-Id: Ieeaa7450196b33ecff1612cf3b55cf173a7941e0
+Upstream-Status: Pending [Not submitted to upstream yet]
+---
+ plat/arm/board/tc/fdts/tc_spmc_trusty_sp_manifest.dts | 2 +-
+ plat/arm/board/tc/fdts/tc_tb_fw_config.dts | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plat/arm/board/tc/fdts/tc_spmc_trusty_sp_manifest.dts b/plat/arm/board/tc/fdts/tc_spmc_trusty_sp_manifest.dts
+index e2ea7b811..66a686c9a 100644
+--- a/plat/arm/board/tc/fdts/tc_spmc_trusty_sp_manifest.dts
++++ b/plat/arm/board/tc/fdts/tc_spmc_trusty_sp_manifest.dts
+@@ -25,7 +25,7 @@
+ vm1 {
+ is_ffa_partition;
+ debug_name = "trusty";
+- load_address = <0xf901f000>;
++ load_address = <0xf901c000>;
+ vcpu_count = <8>;
+ mem_size = <0x3f00000>; /* 64MB TZC DRAM - 1MB align */
+ };
+diff --git a/plat/arm/board/tc/fdts/tc_tb_fw_config.dts b/plat/arm/board/tc/fdts/tc_tb_fw_config.dts
+index a72772fb3..a5bb520fe 100644
+--- a/plat/arm/board/tc/fdts/tc_tb_fw_config.dts
++++ b/plat/arm/board/tc/fdts/tc_tb_fw_config.dts
+@@ -50,7 +50,7 @@
+ #elif TRUSTY_SP_FW_CONFIG
+ trusty {
+ uuid = "40ee25f0-a2bc-304c-8c4c-a173c57d8af1";
+- load-address = <0xf901f000>;
++ load-address = <0xf901c000>;
+ };
+ #else
+ cactus-primary {
+--
+2.25.1
+
deleted file mode 100644
@@ -1,64 +0,0 @@
-From 1a051bef6c63f6871edd8d87e969460f073820a7 Mon Sep 17 00:00:00 2001
-From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Date: Wed, 27 Apr 2022 18:15:47 +0100
-Subject: [PATCH 7/7] fix(plat/tc): disable smmu
-
-Reserve static shared-dma-pool below 4GB. This removes dependency on
-SMMU driver. As there are stability issues in SMMU driver, it is
-disabled. This change is temporary and will be reverted upon proper
-fix and testing.
-
-Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
-Change-Id: I6b1b4c2a0acdf62df8c26007c7ca596774e13710
-Upstream-Status: Pending [Not submitted to upstream yet]
----
- fdts/tc.dts | 16 +++-------------
- 1 file changed, 3 insertions(+), 13 deletions(-)
-
-diff --git a/fdts/tc.dts b/fdts/tc.dts
-index dc86958bf..fbae3e3e8 100644
---- a/fdts/tc.dts
-+++ b/fdts/tc.dts
-@@ -209,12 +209,12 @@
- linux,cma {
- compatible = "shared-dma-pool";
- reusable;
-- size = <0x0 0x8000000>;
-+ reg = <0x0 0xf1000000 0x0 0x8000000>;
- linux,cma-default;
- };
-
-- optee@0xf8e00000 {
-- reg = <0x00000000 0xf8e00000 0 0x00200000>;
-+ optee@0xf0e00000 {
-+ reg = <0x0 0xf0e00000 0 0x00200000>;
- no-map;
- };
- };
-@@ -460,13 +460,6 @@
- >;
- };
-
-- smmu: smmu@2ce00000 {
-- #iommu-cells = <1>;
-- compatible = "arm,smmu-v3";
-- reg = <0x0 0x2ce00000 0x0 0x20000>;
-- status = "okay";
-- };
--
- dp0: display@2cc00000 {
- #address-cells = <1>;
- #size-cells = <0>;
-@@ -476,9 +469,6 @@
- interrupt-names = "DPU";
- clocks = <&scmi_clk 0>;
- clock-names = "aclk";
-- iommus = <&smmu 0>, <&smmu 1>, <&smmu 2>, <&smmu 3>,
-- <&smmu 4>, <&smmu 5>, <&smmu 6>, <&smmu 7>,
-- <&smmu 8>, <&smmu 9>;
- pl0: pipeline@0 {
- reg = <0>;
- clocks = <&scmi_clk 1>;
-2.30.2
-
@@ -1,5 +1,9 @@
# TC0 specific TFA configuration
+# Intermediate SHA with 2.7 baseline version
+SRCREV_tfa = "e95abc4c01822ef43e9e874d63d6596dc0b57279"
+PV = "2.7+git${SRCPV}"
+
DEPENDS += "scp-firmware util-linux-native gptfdisk-native"
FILESEXTRAPATHS:prepend := "${THISDIR}/files/tc:"
@@ -10,7 +14,7 @@ SRC_URI:append = " \
file://0004-fix-plat-tc-increase-tc_tzc_dram1_size.patch \
file://0005-feat-plat-tc-add-spmc-manifest-with-trusty-sp.patch \
file://0006-feat-plat-tc-update-dts-with-trusty-compatible-strin.patch \
- file://0007-fix-plat-tc-disable-smmu.patch \
+ file://0007-feat-arm-tc-Update-trusty-load-address-in-dts-files.patch \
file://generate_metadata.py \
"
@@ -41,6 +45,7 @@ EXTRA_OEMAKE += "SCP_BL2=${RECIPE_SYSROOT}/firmware/scp_ramfw.bin"
EXTRA_OEMAKE += "TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_rsa \
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem"
EXTRA_OEMAKE += "PSA_FWU_SUPPORT=1 ARM_GPT_SUPPORT=1"
+EXTRA_OEMAKE += "CTX_INCLUDE_MTE_REGS=1"
do_generate_gpt() {
gpt_image="${BUILD_DIR}/fip_gpt.bin"
Signed-off-by: Davidson K <davidson.kumaresan@arm.com> Change-Id: I2100b5f0f7af23f59611f4e591efb09d3bcd6942 --- ...ate-trusty-load-address-in-dts-files.patch | 44 +++++++++++++ .../tc/0007-fix-plat-tc-disable-smmu.patch | 64 ------------------- .../trusted-firmware-a-tc.inc | 7 +- 3 files changed, 50 insertions(+), 65 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/tc/0007-feat-arm-tc-Update-trusty-load-address-in-dts-files.patch delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/tc/0007-fix-plat-tc-disable-smmu.patch