From patchwork Fri Sep 5 15:15:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 386401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6830F14009C for ; Sat, 6 Sep 2014 01:18:59 +1000 (EST) Received: from localhost ([::1]:58432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvHt-0000lW-Hr for incoming@patchwork.ozlabs.org; Fri, 05 Sep 2014 11:18:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEl-0003mx-4Q for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPvEf-0002l2-5u for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:43 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:54912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEe-0002ki-K2 for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:36 -0400 Received: by mail-we0-f171.google.com with SMTP id u56so11991736wes.30 for ; Fri, 05 Sep 2014 08:15:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dzVnRup56QP2TebojDzzePl4c/LkFNoZnQrV+k3IhW4=; b=OKM9HgTf3FM48Butyg9CeszQ1qDSnUS2oB8V3B8Dwq4K0btCVc3qevf5NGp4qOJUQ4 h2X6VxPoMcyPXWPXA7ZzKtz5My1sALulIwLj8gN+5uM9cGVj3QeJKQib6bW9BJWUmaMa I03moeoKn/GaQYmMNUOqms60Xow9VIrYuM/DPAjIkIjbzFvaPxuvhK2cpPiDVnpoWIme xbBME/uNdw0IKiJ1An02r47Fkhk2rwh6bBRZNito0MEAEgPrLs1vsXnFgXoKry773ILF HalEo9LMdakUTTu/KvhL6xiPawNjrCq4w8OwhqlwFMHzShxPYaoqcQroC/EKXreIKWJG vIPQ== X-Gm-Message-State: ALoCoQlklK0+Bp3d9Qd3MDNgJfudOMSmGs5EM1xbUu1N5G+TJBariCU2yT+7bqFmR+fzs5NKSbpH X-Received: by 10.180.212.50 with SMTP id nh18mr4298905wic.81.1409930131614; Fri, 05 Sep 2014 08:15:31 -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.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:15:30 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Fri, 5 Sep 2014 17:15:25 +0200 Message-Id: <1409930126-28449-6-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: 74.125.82.171 Cc: fu.wei@linaro.org, christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH 5/6] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Signed-off-by: Ard Biesheuvel Reviewed-by: Peter Maydell --- 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 0cfc11d42962..8d8653978dfe 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -400,7 +400,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);