blob: e182d9cdaf630664f775ae29b784eb13358eb662 [file] [log] [blame]
Patrick Williams864cc432023-02-09 14:54:44 -06001From a5d70b9bf23b38fbc8c6b4c3f384278aeca3bbce Mon Sep 17 00:00:00 2001
Andrew Geisslerea144b032023-01-27 16:03:57 -06002From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
3Date: Fri, 23 Sep 2022 15:17:21 +0100
Patrick Williams864cc432023-02-09 14:54:44 -06004Subject: [PATCH 10/27] arm_ffa: efi: corstone1000: enable MM communication
Andrew Geisslerea144b032023-01-27 16:03:57 -06005
6turn on EFI MM communication
7
8On corstone1000 platform MM communication between u-boot
9and the secure world (Optee) is done using the FF-A bus.
10
11Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
12Cc: Tom Rini <trini@konsulko.com>
13Cc: Simon Glass <sjg@chromium.org>
14Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>
15Cc: Jens Wiklander <jens.wiklander@linaro.org>
16Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/20221122131751.22747-1-abdellatif.elkhlifi@arm.com/]
17
18Changelog:
19===============
20
21v8:
22
23* drop OP-TEE configs from Corstone-1000 defconfig
24
25v7:
26
27* improve the definition of FFA_SHARED_MM_BUFFER_ADDR and
28 FFA_SHARED_MM_BUFFER_OFFSET
29* update FFA_SHARED_MM_BUFFER_ADDR value
30
31v6:
32
33* corstone-1000: enable optee driver
34* corstone-1000: remove CONFIG_ARM_FFA_EFI_RUNTIME_MODE from the defconfig
35
36v4:
37
38* corstone-1000: turn on EFI MM communication
Patrick Williams864cc432023-02-09 14:54:44 -060039
40Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Andrew Geisslerea144b032023-01-27 16:03:57 -060041---
Patrick Williams864cc432023-02-09 14:54:44 -060042 configs/corstone1000_defconfig | 2 ++
43 include/configs/corstone1000.h | 10 ++++++++++
44 2 files changed, 12 insertions(+)
Andrew Geisslerea144b032023-01-27 16:03:57 -060045
46diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig
Patrick Williams864cc432023-02-09 14:54:44 -060047index dddfa2750762..d1dc06c86c2c 100644
Andrew Geisslerea144b032023-01-27 16:03:57 -060048--- a/configs/corstone1000_defconfig
49+++ b/configs/corstone1000_defconfig
50@@ -52,3 +52,5 @@ CONFIG_DM_SERIAL=y
51 CONFIG_USB=y
52 CONFIG_USB_ISP1760=y
53 CONFIG_ERRNO_STR=y
54+CONFIG_EFI_MM_COMM_TEE=y
55+CONFIG_ARM_FFA_TRANSPORT=y
56diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h
Patrick Williams864cc432023-02-09 14:54:44 -060057index 8e0230c135e3..b6226fa12af3 100644
Andrew Geisslerea144b032023-01-27 16:03:57 -060058--- a/include/configs/corstone1000.h
59+++ b/include/configs/corstone1000.h
60@@ -14,6 +14,15 @@
61
62 #include <linux/sizes.h>
63
64+#define FFA_SHARED_MM_BUFFER_SIZE SZ_4K /* 4 KB */
65+
66+/*
67+ * shared buffer physical address used for communication between
68+ * u-boot and the MM SP
69+ */
70+#define FFA_SHARED_MM_BUFFER_ADDR 0x02000000UL
71+#define FFA_SHARED_MM_BUFFER_OFFSET 0
72+
73 #define V2M_BASE 0x80000000
74
75 #define CONFIG_PL011_CLOCK 50000000
Patrick Williams864cc432023-02-09 14:54:44 -060076@@ -22,6 +31,7 @@
77 #define PHYS_SDRAM_1 (V2M_BASE)
78 #define PHYS_SDRAM_1_SIZE 0x80000000
79
80+#define CFG_SYS_SDRAM_BASE PHYS_SDRAM_1
81 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
82
83 #define BOOT_TARGET_DEVICES(func) \
Andrew Geisslerea144b032023-01-27 16:03:57 -060084--
Patrick Williams864cc432023-02-09 14:54:44 -0600852.39.1
Andrew Geisslerea144b032023-01-27 16:03:57 -060086