summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2020-01-23 13:32:08 +0100
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2020-03-02 10:33:38 +0000
commit977b8e83cb0a71af1143d3ab56fd0f95bf8d6c70 (patch)
treef4c022e42c39fc009690c5c2a76283648714dd11
parente1498ce6da91c3e6bc61c67213f10ab927704510 (diff)
mb/emulation/qemu-aarch64: Add MMU support
Enable MMU in bootblock. Makes qemu look more similar to real hardware. There's no real need to activate the MMU. Tested on qemu-system-aarch64: 5 page entries are used out of 32. Change-Id: Ifaed9d3cc11520f180a732d51adce634621b5844 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38534 Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/emulation/qemu-aarch64/Makefile.inc2
-rw-r--r--src/mainboard/emulation/qemu-aarch64/bootblock.c33
-rw-r--r--src/mainboard/emulation/qemu-aarch64/memlayout.ld6
3 files changed, 38 insertions, 3 deletions
diff --git a/src/mainboard/emulation/qemu-aarch64/Makefile.inc b/src/mainboard/emulation/qemu-aarch64/Makefile.inc
index dc0e9f462f..4d5f2bd5fa 100644
--- a/src/mainboard/emulation/qemu-aarch64/Makefile.inc
+++ b/src/mainboard/emulation/qemu-aarch64/Makefile.inc
@@ -5,6 +5,8 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later
+bootblock-y += bootblock.c
+
romstage-y += cbmem.c
bootblock-y += media.c
diff --git a/src/mainboard/emulation/qemu-aarch64/bootblock.c b/src/mainboard/emulation/qemu-aarch64/bootblock.c
new file mode 100644
index 0000000000..280f77ec1e
--- /dev/null
+++ b/src/mainboard/emulation/qemu-aarch64/bootblock.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <arch/mmu.h>
+#include <bootblock_common.h>
+#include <symbols.h>
+
+void bootblock_mainboard_init(void)
+{
+ mmu_init();
+
+ /* Everything below DRAM is device memory */
+ mmu_config_range((void *)0, (uintptr_t)_dram, MA_DEV | MA_RW);
+ /* Set a dummy value for DRAM. ramstage should update the mapping. */
+ mmu_config_range(_dram, 1 * GiB, MA_MEM | MA_RW);
+
+ mmu_config_range(_ttb, REGION_SIZE(ttb), MA_MEM | MA_S | MA_RW);
+ mmu_config_range(_bootblock, REGION_SIZE(bootblock), MA_MEM | MA_S | MA_RW);
+ mmu_config_range(_romstage, REGION_SIZE(romstage), MA_MEM | MA_S | MA_RW);
+ mmu_config_range(_ramstage, REGION_SIZE(ramstage), MA_MEM | MA_S | MA_RW);
+
+ mmu_enable();
+}
diff --git a/src/mainboard/emulation/qemu-aarch64/memlayout.ld b/src/mainboard/emulation/qemu-aarch64/memlayout.ld
index aba4205750..248d0abef0 100644
--- a/src/mainboard/emulation/qemu-aarch64/memlayout.ld
+++ b/src/mainboard/emulation/qemu-aarch64/memlayout.ld
@@ -27,8 +27,8 @@ SECTIONS
STACK(0x60020000, 62K)
FMAP_CACHE(0x6002F800, 2K)
ROMSTAGE(0x60030000, 128K)
- RAMSTAGE(0x60070000, 16M)
+ TTB(0x60070000, 128K)
+ RAMSTAGE(0x600b0000, 16M)
- TTB(0x61100000, 16K)
- POSTRAM_CBFS_CACHE(0x61110000, 1M)
+ POSTRAM_CBFS_CACHE(0x61200000, 1M)
}