Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-bcm283x / init.c

diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index b3f3dfabea8e76cc7ebae8a515b145e4455bbf49..f4d00d892dc7aca725e9131b29a2d2f71bae68ae 100644 (file)
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -7,9 +7,101 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
+#include <init.h>
 #include <dm/device.h>
 #include <fdt_support.h>
 
+#ifdef CONFIG_ARM64
+#include <asm/armv8/mmu.h>
+
+static struct mm_region bcm283x_mem_map[] = {
+       {
+               .virt = 0x00000000UL,
+               .phys = 0x00000000UL,
+               .size = 0x3f000000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+                        PTE_BLOCK_INNER_SHARE
+       }, {
+               .virt = 0x3f000000UL,
+               .phys = 0x3f000000UL,
+               .size = 0x01000000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+                        PTE_BLOCK_NON_SHARE |
+                        PTE_BLOCK_PXN | PTE_BLOCK_UXN
+       }, {
+               /* List terminator */
+               0,
+       }
+};
+
+static struct mm_region bcm2711_mem_map[] = {
+       {
+               .virt = 0x00000000UL,
+               .phys = 0x00000000UL,
+               .size = 0xfe000000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+                        PTE_BLOCK_INNER_SHARE
+       }, {
+               .virt = 0xfc000000UL,
+               .phys = 0xfc000000UL,
+               .size = 0x03800000UL,
+               .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+                        PTE_BLOCK_NON_SHARE |
+                        PTE_BLOCK_PXN | PTE_BLOCK_UXN
+       }, {
+               /* List terminator */
+               0,
+       }
+};
+
+struct mm_region *mem_map = bcm283x_mem_map;
+
+/*
+ * I/O address space varies on different chip versions.
+ * We set the base address by inspecting the DTB.
+ */
+static const struct udevice_id board_ids[] = {
+       { .compatible = "brcm,bcm2837", .data = (ulong)&bcm283x_mem_map},
+       { .compatible = "brcm,bcm2838", .data = (ulong)&bcm2711_mem_map},
+       { .compatible = "brcm,bcm2711", .data = (ulong)&bcm2711_mem_map},
+       { },
+};
+
+static void _rpi_update_mem_map(struct mm_region *pd)
+{
+       int i;
+
+       for (i = 0; i < 2; i++) {
+               mem_map[i].virt = pd[i].virt;
+               mem_map[i].phys = pd[i].phys;
+               mem_map[i].size = pd[i].size;
+               mem_map[i].attrs = pd[i].attrs;
+       }
+}
+
+static void rpi_update_mem_map(void)
+{
+       int ret;
+       struct mm_region *mm;
+       const struct udevice_id *of_match = board_ids;
+
+       while (of_match->compatible) {
+               ret = fdt_node_check_compatible(gd->fdt_blob, 0,
+                                               of_match->compatible);
+               if (!ret) {
+                       mm = (struct mm_region *)of_match->data;
+                       _rpi_update_mem_map(mm);
+                       break;
+               }
+
+               of_match++;
+       }
+}
+#else
+static void rpi_update_mem_map(void) {}
+#endif
+
 unsigned long rpi_bcm283x_base = 0x3f000000;
 
 int arch_cpu_init(void)
@@ -24,6 +116,8 @@ int mach_cpu_init(void)
        int ret, soc_offset;
        u64 io_base, size;
 
+       rpi_update_mem_map();
+
        /* Get IO base from device tree */
        soc_offset = fdt_path_offset(gd->fdt_blob, "/soc");
        if (soc_offset < 0)