ARM: rcar_gen3: fix protection area access error
authorTakeshi Kihara <takeshi.kihara.df@renesas.com>
Tue, 4 Dec 2018 03:51:01 +0000 (12:51 +0900)
committerMarek Vasut <marex@denx.de>
Fri, 7 Dec 2018 15:31:15 +0000 (16:31 +0100)
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

index 0429a2a..3c0f354 100644 (file)
@@ -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;