From patchwork Fri Sep 5 15:15:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 36854 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A6A82202E4 for ; Fri, 5 Sep 2014 15:16:35 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id 29sf40453943yhl.10 for ; Fri, 05 Sep 2014 08:16:35 -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:cc: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=jqWL4LFqVnJNZpH8G8BNi8wLFLBN+YOjWTwJ7Es92WU=; b=AO9LmfjWbnWXJyTzdWf7YXeJT6MraPNCW2foJiR/4OQPMc4qbjG2V/Oy/kEKYWQe9t Upvb7a8/5HNXk5FUfR0d2ItVNunmLX1YROktP6DnZnfA2gIzRX91Bb9c9+TL1p/dJ6xq BMJBzh7nTYDLAhDjGq/JB3aY5nHmAGLN8GsurLw08L11C+bO29+WLRZ7eHlv9Z7brEN3 Wqs9ILg4dIDE/w+A2HM+gvlIkLHxen5BGF88Usakss3xWbiEOC5xXrNzmFhujgdzB6Uy UM97609prFDsRXygCHwAoFFo7J9gfSN84yJFSA/35B3H6M5NjOlruVBiy9Ar+ZUOUljK 0Zpg== X-Gm-Message-State: ALoCoQm4M8saJjpdeOtaSgvrQRgOvOej5eUqj4KFmscn7Eo5Yrhpm96b54lJk7nVVXgW2armL3xz X-Received: by 10.236.16.165 with SMTP id h25mr7082615yhh.30.1409930195510; Fri, 05 Sep 2014 08:16:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.246 with SMTP id l109ls796321qgf.1.gmail; Fri, 05 Sep 2014 08:16:35 -0700 (PDT) X-Received: by 10.52.94.108 with SMTP id db12mr9451568vdb.8.1409930195291; Fri, 05 Sep 2014 08:16:35 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id r2si1465158vda.106.2014.09.05.08.16.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:16:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so12725485vcb.9 for ; Fri, 05 Sep 2014 08:16:35 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr9433398vdb.27.1409930195206; Fri, 05 Sep 2014 08:16:35 -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.45.67 with SMTP id uj3csp97548vcb; Fri, 5 Sep 2014 08:16:34 -0700 (PDT) X-Received: by 10.140.83.17 with SMTP id i17mr18806900qgd.16.1409930193898; Fri, 05 Sep 2014 08:16:33 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id 66si2022462qgz.26.2014.09.05.08.16.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:16:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:58411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvFZ-0004ZU-Ez for patch@linaro.org; Fri, 05 Sep 2014 11:16:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEh-0003ml-0f for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPvEZ-0002ju-UC for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:38 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:36647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEZ-0002jg-O2 for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:31 -0400 Received: by mail-wi0-f182.google.com with SMTP id z2so3146563wiv.3 for ; Fri, 05 Sep 2014 08:15:30 -0700 (PDT) X-Received: by 10.180.95.169 with SMTP id dl9mr4559041wib.51.1409930130332; Fri, 05 Sep 2014 08:15:30 -0700 (PDT) Received: from ards-macbook-pro.local (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by mx.google.com with ESMTPSA id wx3sm1734308wjc.19.2014.09.05.08.15.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:15:29 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Fri, 5 Sep 2014 17:15:24 +0200 Message-Id: <1409930126-28449-5-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> References: <1409930126-28449-1-git-send-email-ard.biesheuvel@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.182 Cc: fu.wei@linaro.org, christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH 4/6] hw/arm/boot: register cpu reset handlers if using -bios 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: ard.biesheuvel@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.178 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 When booting with -bios or -pflash rather than -kernel, we need to make sure reset handlers are registered. Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 8f5649a250fd..0cfc11d42962 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -473,6 +473,10 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } } + for (; cs; cs = CPU_NEXT(cs)) { + qemu_register_reset(do_cpu_reset, ARM_CPU(cs)); + } + /* If no kernel specified, do nothing; we will start from address 0 * (typically a boot ROM image) in the same way as hardware. */