From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAhLY-0003CX-Ot for qemu-devel@nongnu.org; Fri, 25 Jul 2014 11:23:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XAhLV-0004Up-UV for qemu-devel@nongnu.org; Fri, 25 Jul 2014 11:23:48 -0400 From: Peter Maydell Date: Fri, 25 Jul 2014 16:23:37 +0100 Message-Id: <1406301817-20766-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] hw/arm/boot: Set PC correctly when loading AArch64 ELF files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Christopher Covington , qemu-stable@nongnu.org The code in do_cpu_reset() correctly handled AArch64 CPUs when running Linux kernels, but was missing code in the branch of the if() that deals with loading ELF files. Correctly jump to the ELF entry point on reset rather than leaving the reset PC at zero. Reported-by: Christopher Covington Signed-off-by: Peter Maydell Cc: qemu-stable@nongnu.org --- hw/arm/boot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 3d1f4a2..1241761 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -417,8 +417,12 @@ static void do_cpu_reset(void *opaque) if (info) { if (!info->is_linux) { /* Jump to the entry point. */ - env->regs[15] = info->entry & 0xfffffffe; - env->thumb = info->entry & 1; + if (env->aarch64) { + env->pc = info->entry; + } else { + env->regs[15] = info->entry & 0xfffffffe; + env->thumb = info->entry & 1; + } } else { if (CPU(cpu) == first_cpu) { if (env->aarch64) { -- 1.9.1