summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2020-01-23 14:10:07 +0100
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2020-03-02 10:36:37 +0000
commit792fd51b14d1056514e2ddfeb24cf6436df828fb (patch)
tree38e73d87b72ae6fca1df506a4cd21c621e902849
parent977b8e83cb0a71af1143d3ab56fd0f95bf8d6c70 (diff)
downloadcoreboot-792fd51b14d1056514e2ddfeb24cf6436df828fb.tar.xz
mb/emulation/qemu-aarch64: Add ARM trusted firmware support
Linux expects a working PSCI and hangs if not found. Add BL31 into CBFS as '-M virt,secure=on -bios ' commands line arguments cause qemu's internal PSCI emulation to shutdown. BL31 is placed in qemu's SECURERAM memory region and won't conflict with resources in DRAM. Tested on qemu-system-aarch64: Fixes a hang and allows to boot into Linux 5.4.14 userspace. Change-Id: I809742522240185431621cc4fd8b9c7deaf2bb54 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38535 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
-rw-r--r--src/mainboard/emulation/qemu-aarch64/Kconfig1
-rw-r--r--src/mainboard/emulation/qemu-aarch64/Makefile.inc2
-rw-r--r--src/mainboard/emulation/qemu-aarch64/bootblock.c4
-rw-r--r--src/mainboard/emulation/qemu-aarch64/include/mainboard/addressmap.h2
-rw-r--r--src/mainboard/emulation/qemu-aarch64/mainboard.c8
-rw-r--r--src/mainboard/emulation/qemu-aarch64/memlayout.ld1
6 files changed, 18 insertions, 0 deletions
diff --git a/src/mainboard/emulation/qemu-aarch64/Kconfig b/src/mainboard/emulation/qemu-aarch64/Kconfig
index 895446ddd7..0579b04c90 100644
--- a/src/mainboard/emulation/qemu-aarch64/Kconfig
+++ b/src/mainboard/emulation/qemu-aarch64/Kconfig
@@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_FORCE_NATIVE_VGA_INIT
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MISSING_BOARD_RESET
+ select ARM64_USE_ARM_TRUSTED_FIRMWARE
config MAINBOARD_DIR
string
diff --git a/src/mainboard/emulation/qemu-aarch64/Makefile.inc b/src/mainboard/emulation/qemu-aarch64/Makefile.inc
index 4d5f2bd5fa..b710f15587 100644
--- a/src/mainboard/emulation/qemu-aarch64/Makefile.inc
+++ b/src/mainboard/emulation/qemu-aarch64/Makefile.inc
@@ -24,3 +24,5 @@ ramstage-y += memlayout.ld
bootblock-y += bootblock_custom.S
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
+
+BL31_MAKEARGS += PLAT=qemu ARM_ARCH_MAJOR=8 M0_CROSS_COMPILE="$(CROSS_COMPILE_arm)"
diff --git a/src/mainboard/emulation/qemu-aarch64/bootblock.c b/src/mainboard/emulation/qemu-aarch64/bootblock.c
index 280f77ec1e..77d7e532de 100644
--- a/src/mainboard/emulation/qemu-aarch64/bootblock.c
+++ b/src/mainboard/emulation/qemu-aarch64/bootblock.c
@@ -15,6 +15,8 @@
#include <bootblock_common.h>
#include <symbols.h>
+extern u8 _secram[], _esecram[];
+
void bootblock_mainboard_init(void)
{
mmu_init();
@@ -29,5 +31,7 @@ void bootblock_mainboard_init(void)
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_config_range(_secram, REGION_SIZE(secram), MA_MEM | MA_S | MA_RW);
+
mmu_enable();
}
diff --git a/src/mainboard/emulation/qemu-aarch64/include/mainboard/addressmap.h b/src/mainboard/emulation/qemu-aarch64/include/mainboard/addressmap.h
index 6f0c80257b..7233863934 100644
--- a/src/mainboard/emulation/qemu-aarch64/include/mainboard/addressmap.h
+++ b/src/mainboard/emulation/qemu-aarch64/include/mainboard/addressmap.h
@@ -23,6 +23,7 @@
* 0x0905_0000..0x0907_0000: SMMU (smmu-v3)
* 0x0a00_0000..0x0a00_0200: MMIO (virtio)
* 0x0c00_0000..0x0e00_0000: Platform bus
+ * 0x0e00_0000..0x0eff_ffff: Secure SRAM
* 0x4000_0000..: RAM
*/
#define VIRT_UART_BASE 0x09000000
@@ -32,3 +33,4 @@
#define VIRT_SMMU_BASE 0x09050000
#define VIRT_MMIO_BASE 0x0a000000
#define VIRT_PLATFORM_BUS_BASE 0x0c000000
+#define VIRT_SECRAM_BASE 0xe000000
diff --git a/src/mainboard/emulation/qemu-aarch64/mainboard.c b/src/mainboard/emulation/qemu-aarch64/mainboard.c
index 573545532a..2980f483d8 100644
--- a/src/mainboard/emulation/qemu-aarch64/mainboard.c
+++ b/src/mainboard/emulation/qemu-aarch64/mainboard.c
@@ -10,6 +10,14 @@
#include <ramdetect.h>
#include <symbols.h>
#include <device/device.h>
+#include <bootmem.h>
+
+extern u8 _secram[], _esecram[];
+
+void bootmem_platform_add_ranges(void)
+{
+ bootmem_add_range((uintptr_t)_secram, REGION_SIZE(secram), BM_MEM_BL31);
+}
static void mainboard_enable(struct device *dev)
{
diff --git a/src/mainboard/emulation/qemu-aarch64/memlayout.ld b/src/mainboard/emulation/qemu-aarch64/memlayout.ld
index 248d0abef0..4af2362474 100644
--- a/src/mainboard/emulation/qemu-aarch64/memlayout.ld
+++ b/src/mainboard/emulation/qemu-aarch64/memlayout.ld
@@ -22,6 +22,7 @@ SECTIONS
{
REGION(flash, 0x00000000, CONFIG_ROM_SIZE, 8)
+ REGION(secram, 0xe000000, 0x1000000, 4096)
DRAM_START(0x40000000)
BOOTBLOCK(0x60010000, 64K)
STACK(0x60020000, 62K)