Received: from eggs.gnu.org ([2001:4830:134:3::10]:60981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPV0b-0006mp-G5 for qemu-devel@nongnu.org; Fri, 27 Sep 2013 06:10:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPV0V-0004t1-FY for qemu-devel@nongnu.org; Fri, 27 Sep 2013 06:10:49 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:50909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPV0V-0004sN-2p for qemu-devel@nongnu.org; Fri, 27 Sep 2013 06:10:43 -0400 Received: by mail-wg0-f44.google.com with SMTP id b13so2466590wgh.35 for ; Fri, 27 Sep 2013 03:10:42 -0700 (PDT) From: "Mian M. Hamayun" Date: Fri, 27 Sep 2013 12:10:10 +0200 Message-Id: <1380276614-857-8-git-send-email-m.hamayun@virtualopensystems.com> In-Reply-To: <1380276614-857-1-git-send-email-m.hamayun@virtualopensystems.com> References: <1380276614-857-1-git-send-email-m.hamayun@virtualopensystems.com> Subject: [Qemu-devel] [PATCH v3 07/11] AARCH64: Add boot support for aarch64 processor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, agraf@suse.de, tech@virtualopensystems.com, kvmarm@lists.cs.columbia.edu, afaerber@suse.de From: "Mian M. Hamayun" This commit adds support for booting a single AArch64 CPU by setting appropriate registers. The bootloader includes placehoders for Board-ID that are used to implement uniform indexing across different bootloaders. We also introduce Cortex-A57 to virt platform. Signed-off-by: Mian M. Hamayun --- hw/arm/boot.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/virt.c | 8 ++++++++ 2 files changed, 65 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 4c1170e..0471eb8 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -19,6 +19,23 @@ #define KERNEL_ARGS_ADDR 0x100 +#ifdef TARGET_AARCH64 +static uint32_t bootloader_arm64[] = { + 0x580000c0, /* ldr x0, 18 ; Load the lower 32-bits of DTB */ + 0xaa1f03e1, /* mov x1, xzr */ + 0xaa1f03e2, /* mov x2, xzr */ + 0xaa1f03e3, /* mov x3, xzr */ + 0x58000084, /* ldr x4, 20 ; Load the lower 32-bits of kernel entry */ + 0xd61f0080, /* br x4 ; Jump to the kernel entry point */ + 0x00000000, /* .word @DTB Lower 32-bits */ + 0x00000000, /* .word @DTB Higher 32-bits */ + 0x00000000, /* .word @Kernel Entry Lower 32-bits */ + 0x00000000, /* .word @Kernel Entry Higher 32-bits */ + 0x00000000, /* .word @Board ID Lower 32-bits -- Placeholder */ + 0x00000000 /* .word @Board ID Higher 32-bits -- Placeholder */ +}; +#endif + /* The worlds second smallest bootloader. Set r0-r2, then jump to kernel. */ static uint32_t bootloader_arm32[] = { 0xe3a00000, /* mov r0, #0 */ @@ -103,11 +120,37 @@ static void setup_boot_env_32(void) return; } +#ifdef TARGET_AARCH64 +static void setup_boot_env_64(void) +{ + bootloader = bootloader_arm64; + bootloader_array_size = ARRAY_SIZE(bootloader_arm64); + + kernel_args_index = bootloader_array_size - 6; + kernel_entry_index = bootloader_array_size - 4; + kernel_boardid_index = bootloader_array_size - 2; + return; +} +#endif + static void setup_boot_env(ARMCPU *cpu) { +#ifdef TARGET_AARCH64 + CPUARMState *env = &cpu->env; + if(env->aarch64) { + /* AARCH64 Mode */ + kernel_load_addr = 0x00080000; + setup_boot_env_64(); + } + else { + /* AARCH32 Mode */ + /* TODO: Specify Kernel Load Address for AARCH32 */ + } +#else /* ARMv7 */ kernel_load_addr = 0x00010000; setup_boot_env_32(); +#endif return; } @@ -380,8 +423,22 @@ static void do_cpu_reset(void *opaque) env->regs[15] = info->entry & 0xfffffffe; env->thumb = info->entry & 1; } else { +#ifdef TARGET_AARCH64 + if(env->aarch64) { + env->pstate = PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT | PSR_MODE_EL1h; + } else { + hw_error("AArch32 mode is currently not supported\n"); + } + env->xregs[0] = 0; + env->xregs[1] = -1; +#endif if (CPU(cpu) == first_cpu) { +#ifdef TARGET_AARCH64 + env->xregs[2] = bootloader[kernel_args_index]; + env->pc = info->loader_start; +#else env->regs[15] = info->loader_start; +#endif if (!info->dtb_filename) { if (old_param) { set_kernel_args_old(info); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 448a0e5..8043fd4 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -118,6 +118,14 @@ static VirtBoardInfo machines[] = { .memmap = a15memmap, .irqmap = a15irqmap, }, + { + .cpu_model = "cortex-a57", + .cpu_compatible = "arm,arm-v8", + .qdevname = "a57mpcore_priv", + .gic_compatible = "arm,cortex-a15-gic", + .memmap = a15memmap, + .irqmap = a15irqmap, + }, }; static VirtBoardInfo *find_machine_info(const char *cpu) -- 1.8.1.2