From patchwork Wed Sep 10 10:59:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 37194 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2CD9320491 for ; Wed, 10 Sep 2014 11:04:04 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id tp5sf19503660ieb.9 for ; Wed, 10 Sep 2014 04:04:03 -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=ZNI3UpRO3Lt8+/EGo7ZMxlsP099nVprge/hSM82cdI4=; b=mexxhLpluU1ttcclpzj1vs8u558uHm7pfJJ8mLCNSxwH3p9UO4LJUpLRj4rvaHRYLC 0NJqG8w9pSpG9Af8j1P/FhnpocY1u0HP8hIza4aQozu4lLi+nPB58HBo1pPbCq3BGFJy UNnZQpY4yFFd+oMDP9H5c5XFbMmtDeVrt/85GvT5dKe5QBdqQqoAZGrFAzHSBaP1WM+h NTQH4fG0QIqg6UBCS1/w2QGcTqGDrN3hZ9YGfEDgOzFGRmM/ZAelRqIM77NClHi04U3m lJ7SjjDeMJuV/6wEikmsn30AOP7u4BEZ1JUUhPTeyEztKsVnMwPqxV3T6puDyKBbvdEo 57QQ== X-Gm-Message-State: ALoCoQmOf7Ezywm8QwXfi1P00RkfBsrOOY7dTF8CHNfq98uiqm3pjRHC1HKwjJ93vB3jyKHrLl15 X-Received: by 10.43.64.202 with SMTP id xj10mr9901409icb.0.1410347043824; Wed, 10 Sep 2014 04:04:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.41 with SMTP id p38ls2290549qga.55.gmail; Wed, 10 Sep 2014 04:04:03 -0700 (PDT) X-Received: by 10.52.165.129 with SMTP id yy1mr9064276vdb.57.1410347043741; Wed, 10 Sep 2014 04:04:03 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id r7si1296315vcy.73.2014.09.10.04.04.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Sep 2014 04:04:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hy10so4058064vcb.33 for ; Wed, 10 Sep 2014 04:04:03 -0700 (PDT) X-Received: by 10.221.68.66 with SMTP id xx2mr35921509vcb.1.1410347043659; Wed, 10 Sep 2014 04:04:03 -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 uj3csp419454vcb; Wed, 10 Sep 2014 04:04:02 -0700 (PDT) X-Received: by 10.140.83.178 with SMTP id j47mr43815594qgd.91.1410347041668; Wed, 10 Sep 2014 04:04:01 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o111si18289135qge.85.2014.09.10.04.04.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 10 Sep 2014 04:04:01 -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]:55157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfgv-0004l5-3a for patch@linaro.org; Wed, 10 Sep 2014 07:04:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfdB-0006yS-5C for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRfd4-00035q-7P for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:09 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:50426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRfd4-00034s-29 for qemu-devel@nongnu.org; Wed, 10 Sep 2014 07:00:02 -0400 Received: by mail-we0-f175.google.com with SMTP id w61so3553963wes.20 for ; Wed, 10 Sep 2014 04:00:01 -0700 (PDT) X-Received: by 10.194.77.212 with SMTP id u20mr49681221wjw.27.1410346801181; Wed, 10 Sep 2014 04:00:01 -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 wr10sm18127240wjc.10.2014.09.10.03.59.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Sep 2014 04:00:00 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Wed, 10 Sep 2014 12:59:47 +0200 Message-Id: <1410346790-31743-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410346790-31743-1-git-send-email-ard.biesheuvel@linaro.org> References: <1410346790-31743-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: 74.125.82.175 Cc: christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH v2 1/4] hw/arm/boot: load DTB as a ROM image 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.174 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 In order to make the device tree blob (DTB) available in memory not only at first boot, but also after system reset, use rom_blob_add_fixed() to install it into memory. Reviewed-by: Peter Maydell Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e32f2f415885..50eca931e1a4 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -396,7 +396,10 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) qemu_fdt_dumpdtb(fdt, size); - cpu_physical_memory_write(addr, fdt, size); + /* Put the DTB into the memory map as a ROM image: this will ensure + * the DTB is copied again upon reset, even if addr points into RAM. + */ + rom_add_blob_fixed("dtb", fdt, size, addr); g_free(fdt);