[U-Boot,2/3] ARM: rcar_gen3: fix protection area access error

Message ID 20181207151429.5172-2-marek.vasut+renesas@gmail.com
State Accepted
Commit 10854bcc25e1375e472a9bda73406a15b79600a4
Delegated to: Marek Vasut
Headers show
Series
  • [U-Boot,1/3] ARM: rcar_gen3: fix protection area access error at Cortex-A53
Related show

Commit Message

Marek Vasut Dec. 7, 2018, 3:14 p.m.
From: Takeshi Kihara <takeshi.kihara.df@renesas.com>

This patch fixes the problem that "main memory domain AXI secure access
protection error" occurs. Exclude the area (0x43f00000 to 0x47DFFFFF)
set by DBSC from the map area.

Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
---
 arch/arm/mach-rmobile/memmap-gen3.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Patch

diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c
index 0429a2ac51..3c0f3548cb 100644
--- a/arch/arm/mach-rmobile/memmap-gen3.c
+++ b/arch/arm/mach-rmobile/memmap-gen3.c
@@ -82,8 +82,16 @@  void enable_caches(void)
 
 		/* Mark memory reserved by ATF as cacheable too. */
 		if (start == 0x48000000) {
-			start = 0x40000000ULL;
-			size += 0x08000000ULL;
+			/* Unmark protection area (0x43F00000 to 0x47DFFFFF) */
+			gen3_mem_map[i].virt = 0x40000000ULL;
+			gen3_mem_map[i].phys = 0x40000000ULL;
+			gen3_mem_map[i].size = 0x03F00000ULL;
+			gen3_mem_map[i].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+						PTE_BLOCK_INNER_SHARE;
+			i++;
+
+			start = 0x47E00000ULL;
+			size += 0x00200000ULL;
 		}
 
 		gen3_mem_map[i].virt = start;