[PATCH 1/3] arm-bsp/optee: add patch to support higher DRAM on TC

[PATCH 1/3] arm-bsp/optee: add patch to support higher DRAM on TC

[Arunachalam Ganapathy]

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: I54831317126b27e8635d941dce321df8471301f1
---
 ...ction-ID-according-to-FFA-v1.1-spec.patch} |  0
 ...e-UUID.patch => 0003-Fix-optee-UUID.patch} |  0
 ...lcompute-add-support-for-higher-DRAM.patch | 60 +++++++++++++++++++
 .../optee/optee-os-generic-tc.inc             |  7 ++-
 4 files changed, 64 insertions(+), 3 deletions(-)
 rename meta-arm-bsp/recipes-security/optee/files/optee-os/tc/{0003-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch => 0002-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch} (100%)
 rename meta-arm-bsp/recipes-security/optee/files/optee-os/tc/{0001-Fix-optee-UUID.patch => 0003-Fix-optee-UUID.patch} (100%)
 create mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0004-plat-totalcompute-add-support-for-higher-DRAM.patch

diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0003-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0002-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0003-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch
rename to meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0002-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch
diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-Fix-optee-UUID.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0003-Fix-optee-UUID.patch
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-Fix-optee-UUID.patch
rename to meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0003-Fix-optee-UUID.patch
diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0004-plat-totalcompute-add-support-for-higher-DRAM.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0004-plat-totalcompute-add-support-for-higher-DRAM.patch
new file mode 100644
index 0000000..293ea7d
--- /dev/null
+++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0004-plat-totalcompute-add-support-for-higher-DRAM.patch
@@ -0,0 +1,60 @@
+From 7fb6d720a285b6135a9247b2adde833ea90e2549 Mon Sep 17 00:00:00 2001
+From: Usama Arif <usama.arif@arm.com>
+Date: Mon, 27 Sep 2021 19:58:56 +0100
+Subject: [PATCH] plat-totalcompute: add support for higher DRAM
+
+The new 6GB DRAM bank starts at 0x8080000000.
+
+Signed-off-by: Usama Arif <usama.arif@arm.com>
+Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
+
+Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/commit/6d8430f943e091282849b188fbc0847c159e5de4]
+Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
+---
+ core/arch/arm/plat-totalcompute/conf.mk           | 2 ++
+ core/arch/arm/plat-totalcompute/main.c            | 1 +
+ core/arch/arm/plat-totalcompute/platform_config.h | 3 +++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/core/arch/arm/plat-totalcompute/conf.mk b/core/arch/arm/plat-totalcompute/conf.mk
+index 558b7889..e894b1e1 100644
+--- a/core/arch/arm/plat-totalcompute/conf.mk
++++ b/core/arch/arm/plat-totalcompute/conf.mk
+@@ -24,6 +24,8 @@ platform-cflags-debug-info = -gdwarf-2
+ platform-aflags-debug-info = -gdwarf-2
+ endif
+ 
++$(call force,CFG_CORE_ARM64_PA_BITS,40)
++
+ ifneq (,$(filter ${PLATFORM_FLAVOR},tc0 tc1))
+ CFG_TEE_CORE_NB_CORE = 8
+ 
+diff --git a/core/arch/arm/plat-totalcompute/main.c b/core/arch/arm/plat-totalcompute/main.c
+index 42acf8dd..eab237bf 100644
+--- a/core/arch/arm/plat-totalcompute/main.c
++++ b/core/arch/arm/plat-totalcompute/main.c
+@@ -27,6 +27,7 @@ register_phys_mem_pgdir(MEM_AREA_IO_SEC, GICD_BASE, GIC_DIST_REG_SIZE);
+ #endif
+ 
+ register_ddr(DRAM0_BASE, DRAM0_SIZE);
++register_ddr(DRAM1_BASE, DRAM1_SIZE);
+ 
+ #ifndef CFG_CORE_SEL2_SPMC
+ void main_init_gic(void)
+diff --git a/core/arch/arm/plat-totalcompute/platform_config.h b/core/arch/arm/plat-totalcompute/platform_config.h
+index 4255abca..b474a899 100644
+--- a/core/arch/arm/plat-totalcompute/platform_config.h
++++ b/core/arch/arm/plat-totalcompute/platform_config.h
+@@ -26,6 +26,9 @@
+ #define DRAM0_BASE		0x80000000
+ #define DRAM0_SIZE		0x7d000000
+ 
++#define DRAM1_BASE		0x8080000000ULL
++#define DRAM1_SIZE		0x180000000ULL
++
+ #define TZCDRAM_BASE		0xff000000
+ #define TZCDRAM_SIZE		0x01000000
+ 
+-- 
+2.30.2
+
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc b/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
index 63abbb1..eeaa59a 100644
--- a/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
+++ b/meta-arm-bsp/recipes-security/optee/optee-os-generic-tc.inc
@@ -1,7 +1,7 @@
 # Total Compute (tc) specific configuration for optee-os and optee-os-tadevkit
 
 # Intermediate SHA with 3.14 baseline version
-# This has TC0 platform support
+# This has TC0 and TC1 platform support
 SRCREV = "e4f34e786135079160697d88212591105a65fbce"
 PV = "3.14.0+git${SRCPV}"
 
@@ -9,8 +9,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/tc:"
 SRC_URI:append:tc = " \
     file://sp_layout.json \
     file://0001-WIP-Enable-managed-exit.patch \
-    file://0003-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch \
-    file://0001-Fix-optee-UUID.patch \
+    file://0002-ffa-Update-function-ID-according-to-FFA-v1.1-spec.patch \
+    file://0003-Fix-optee-UUID.patch \
+    file://0004-plat-totalcompute-add-support-for-higher-DRAM.patch \
     "
 
 COMPATIBLE_MACHINE = "(tc?)"
-- 
2.30.2

[PATCH 2/3] arm-bsp: Set preferred u-boot version to 2021.10 for TC

[Arunachalam Ganapathy]

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: I1c814cdbcff158f70910cafb4cbd0656271acaef
---
 meta-arm-bsp/conf/machine/include/tc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc
index abdbfd3..71cb17c 100644
--- a/meta-arm-bsp/conf/machine/include/tc.inc
+++ b/meta-arm-bsp/conf/machine/include/tc.inc
@@ -6,6 +6,7 @@ MACHINEOVERRIDES =. "tc:"
 
 # Das U-boot
 UBOOT_MACHINE ?= "total_compute_defconfig"
+PREFERRED_VERSION_u-boot ?= "2021.10"
 UBOOT_RD_LOADADDRESS = "0x88000000"
 UBOOT_RD_ENTRYPOINT = "0x88000000"
 UBOOT_LOADADDRESS = "0x80080000"
-- 
2.30.2

[PATCH 3/3] arm/u-boot: add patch to support higher DRAM on TC

[Arunachalam Ganapathy]

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: Ifbf9e73a0e1134d1a0ecce036c9ba53fe7d5b1bf
---
 ...m-total_compute-increase-DRAM-to-8GB.patch | 47 +++++++++++++++++++
 .../recipes-bsp/u-boot/u-boot_%.bbappend      |  5 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-increase-DRAM-to-8GB.patch

diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-increase-DRAM-to-8GB.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-increase-DRAM-to-8GB.patch
new file mode 100644
index 0000000..d1cfcdb
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-increase-DRAM-to-8GB.patch
@@ -0,0 +1,47 @@
+From bdb7de7cdef6ece51dfcee927d3ce0c97fc431f0 Mon Sep 17 00:00:00 2001
+From: Usama Arif <usama.arif@arm.com>
+Date: Tue, 12 Oct 2021 13:43:16 +0100
+Subject: [PATCH] arm: total_compute: increase DRAM to 8GB
+
+The extra 6GB start at 0x8080000000.
+
+Signed-off-by: Usama Arif <usama.arif@arm.com>
+
+Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/b20b16a794b073807ef8d6840772a92788b3e226]
+Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
+---
+ board/armltd/total_compute/total_compute.c | 3 +++
+ include/configs/total_compute.h            | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c
+index b7eaab0851..b7772f79a3 100644
+--- a/board/armltd/total_compute/total_compute.c
++++ b/board/armltd/total_compute/total_compute.c
+@@ -59,6 +59,9 @@ int dram_init_banksize(void)
+ 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+ 	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+ 
++	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
++	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
++
+ 	return 0;
+ }
+ 
+diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
+index cc93f1930a..283268607a 100644
+--- a/include/configs/total_compute.h
++++ b/include/configs/total_compute.h
+@@ -34,6 +34,9 @@
+ #define PHYS_SDRAM_1_SIZE	0x80000000 - DRAM_SEC_SIZE
+ #define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
+ 
++#define PHYS_SDRAM_2		0x8080000000
++#define PHYS_SDRAM_2_SIZE	0x180000000
++
+ #define CONFIG_ARM_PL180_MMCI_BASE		0x001c050000
+ #define CONFIG_SYS_MMC_MAX_BLK_COUNT		127
+ #define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ	12000000
+-- 
+2.30.2
+
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
index 5a927ba..a0709dd 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -77,4 +77,7 @@ SRC_URI:append:fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-varian
 #
 # TC0 and TC1 MACHINES
 #
-SRC_URI:append:tc = " file://bootargs.cfg"
+SRC_URI:append:tc = " \
+        file://bootargs.cfg \
+        file://0001-arm-total_compute-increase-DRAM-to-8GB.patch \
+        "
-- 
2.30.2

Re: [PATCH 1/3] arm-bsp/optee: add patch to support higher DRAM on TC

[Jon Mason]

On Fri, 21 Jan 2022 11:56:41 +0000, Arunachalam Ganapathy wrote:
> 


Applied, thanks!

[1/3] arm-bsp/optee: add patch to support higher DRAM on TC
      commit: 2201fa268d6b2184e60fe8e8f5e1c25b6858ebf0
[2/3] arm-bsp: Set preferred u-boot version to 2021.10 for TC
      commit: 88334e166432e7bc5fd7f857ade8f59aaecabba9
[3/3] arm/u-boot: add patch to support higher DRAM on TC
      commit: 5377fb7e096290d2c05ab69032ae6b436c5f9358

Best regards,
-- 
Jon Mason <jon.mason@arm.com>