From patchwork Mon Aug 4 13:53:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 34843 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7A5FB23B1A for ; Mon, 4 Aug 2014 13:57:21 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id tr6sf41683946ieb.2 for ; Mon, 04 Aug 2014 06:57:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=/U4jJ/YqmGBf0jzXJrRPrWIlomdnH3gYVOvPPknwnLA=; b=PPlD+Ek/bXiKet6b3zOfurQuEJfI1LZ+sz/L/Myjk60FVvjsC5KkoBJZpl6mXKEdSP eqyLXSDVJIslCf6ZWH5au05iCobVrxN9ZDEgqQpqFa1KLJNiNemgOcemEvkOvFUqjoUs NTi+cRF/Wk4bPJChFr89cVxPWr7JSF65/BGdx8GMGyggwpi4oVULVqONlE2bfVs5Czp4 m5weCIq8Hh2343NqCfBl7GbX/1F1GJxYNxSdowFz6Ax1T59jwxAN7QWXt8Gre8HP2IHB A2whssibyuObE4/5hd/tzK6+mLyiGq3Iuvlo6qE8DGl8XsMlMhkDTvXiGi3qK/kNaEj/ lmXw== X-Gm-Message-State: ALoCoQkqeQpAyOl3Or1WZh6NyQHP3X90VhyCECHvS0koAEiG07197N8M1CxACkhUX/x05tuH6Azk X-Received: by 10.182.53.138 with SMTP id b10mr9451099obp.5.1407160641016; Mon, 04 Aug 2014 06:57:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.6 with SMTP id q6ls2108042qgq.49.gmail; Mon, 04 Aug 2014 06:57:20 -0700 (PDT) X-Received: by 10.220.68.208 with SMTP id w16mr1037006vci.79.1407160640905; Mon, 04 Aug 2014 06:57:20 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id py4si11962002vcb.49.2014.08.04.06.57.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:57:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id hq11so11054743vcb.2 for ; Mon, 04 Aug 2014 06:57:20 -0700 (PDT) X-Received: by 10.220.97.5 with SMTP id j5mr23641742vcn.16.1407160640835; Mon, 04 Aug 2014 06:57:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp306392vcb; Mon, 4 Aug 2014 06:57:20 -0700 (PDT) X-Received: by 10.140.82.242 with SMTP id h105mr34743411qgd.98.1407160640192; Mon, 04 Aug 2014 06:57:20 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d7si28628475qag.107.2014.08.04.06.57.20 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:57:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:52469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIlL-0001WR-Sk for patch@linaro.org; Mon, 04 Aug 2014 09:57:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIiD-00058Y-Vm for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEIiA-0007c3-0Z for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:05 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIi9-0006mN-Ol for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:01 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XEIhc-0001Aa-VX for qemu-devel@nongnu.org; Mon, 04 Aug 2014 14:53:28 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 4 Aug 2014 14:53:17 +0100 Message-Id: <1407160408-4467-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1407160408-4467-1-git-send-email-peter.maydell@linaro.org> References: <1407160408-4467-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 01/12] hw/arm/boot: Set PC correctly when loading AArch64 ELF files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 Tested-by: Christopher Covington 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) {