summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-plat-rcar-fix-MMU-configuration-of-shared-memory.patch
blob: f1d0739d3282139e0d567d5033b489346c955285 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
From 67e2c72b2a20c859bc5cb7a2ea91b9bd9732c3a4 Mon Sep 17 00:00:00 2001
From: Jun Miyauchi <jun.miyauchi.sr@hitachi.com>
Date: Fri, 26 Oct 2018 10:39:08 +0900
Subject: [PATCH] plat-rcar: fix MMU configuration of shared memory

Signed-off-by: Jun Miyauchi <jun.miyauchi.sr@hitachi.com>
---
 core/arch/arm/plat-rcar/platform_config.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/arch/arm/plat-rcar/platform_config.h b/core/arch/arm/plat-rcar/platform_config.h
index ebc12557..3c8fd8af 100644
--- a/core/arch/arm/plat-rcar/platform_config.h
+++ b/core/arch/arm/plat-rcar/platform_config.h
@@ -48,11 +48,11 @@
 #define CFG_TA_RAM_SIZE		(0x01E00000U)	/* TA RAM size		*/
 
 #define CFG_SHMEM_START		(0x47E00000U)	/* Share Memory address	*/
-#define CFG_SHMEM_SIZE		(0x00200000U)	/* Share Memory size	*/
-					/* plus OP-TEE Log Area NS size(1MB) */
+#define CFG_SHMEM_SIZE		(0x00100000U)	/* Share Memory size	*/
 
 #define OPTEE_LOG_BASE		(0x46400000U)	/* OP-TEE Log Area address */
 #define OPTEE_LOG_NS_BASE	(0x47FEC000U)	/* OP-TEE Log Area NS address */
+#define OPTEE_LOG_NS_SIZE	(0x00014000U)   /* OP-TEE Log Area NS size */
 
 #define TA_VERIFICATION_BASE	(0x46200000U)	/* TA area for verification */
 #define TA_VERIFICATION_SIZE	(0x00100000U)	/* TA verification size */
@@ -121,11 +121,9 @@
 #define MEMORY1_EXEC		false
 
 /* LOG Area for Normal World */
-/* Map with CFG_SHMEM_START
-#define MEMORY2_BASE		ROUNDDOWN(OPTEE_LOG_NS_BASE, MEM_SECTION_SIZE)
-*/
-#define MEMORY2_SIZE		(MEM_SECTION_SIZE)
-#define MEMORY2_TYPE		MEM_AREA_IO_NSEC
+#define MEMORY2_BASE		(OPTEE_LOG_NS_BASE)
+#define MEMORY2_SIZE		(OPTEE_LOG_NS_SIZE)
+#define MEMORY2_TYPE		MEM_AREA_RAM_NSEC
 #define MEMORY2_SECURE		false
 #define MEMORY2_CACHED		false
 #define MEMORY2_DEVICE		false
-- 
2.14.1