From patchwork Thu Sep 11 16:45:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 37272 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 17D7020D9F for ; Thu, 11 Sep 2014 16:49:01 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id a41sf30864140yho.8 for ; Thu, 11 Sep 2014 09:49:00 -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=VTWu1cRoRHwzlqHj6DpEG1+YjBRblojN1ggvH735Y9BLqiXDBuYPbcY9TDjXVFWkjh 6V73X2bk1GRytq2w7KaV5dGogUxKFsrqWsdBLzQ+5tBcciThrNMB/bYB0hhgidICeMzm pjHgXCX9FYLNfN2Faxoi7OFa0WNZNfMoCdlAYJXuzKLpudzGs8ZH5q1/8tuxevAQ/ycz qbBDBIa4cMA95rM+Cb+xuuyh4shECC4g6Ne7bkusf8oV7SttB9Fsl+XNURI66gqNQSGP dUQVPl52H09KKE79MVe38tdjbfazRpGa77gSfWCIlMIf3aKdG8P1jRUySfwl+BPwCEus sxJQ== X-Gm-Message-State: ALoCoQmK7V2+IgTrj+zZ8k6wp/bfyQ0ERrhwv1vQTR1YqBkwpmzqTJOJD0nfpEXlgGFg+Vy2P0PK X-Received: by 10.236.31.68 with SMTP id l44mr998253yha.29.1410454140916; Thu, 11 Sep 2014 09:49:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.102 with SMTP id a93ls281137qge.15.gmail; Thu, 11 Sep 2014 09:49:00 -0700 (PDT) X-Received: by 10.52.75.100 with SMTP id b4mr1519326vdw.66.1410454140806; Thu, 11 Sep 2014 09:49:00 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id wl13si793918vcb.9.2014.09.11.09.49.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Sep 2014 09:49:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hq11so2299882vcb.6 for ; Thu, 11 Sep 2014 09:49:00 -0700 (PDT) X-Received: by 10.52.231.65 with SMTP id te1mr1243922vdc.86.1410454140729; Thu, 11 Sep 2014 09:49:00 -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 uj3csp621063vcb; Thu, 11 Sep 2014 09:49:00 -0700 (PDT) X-Received: by 10.229.33.202 with SMTP id i10mr3497363qcd.2.1410454138746; Thu, 11 Sep 2014 09:48:58 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id f2si1835051qai.70.2014.09.11.09.48.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Sep 2014 09:48:58 -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]:40097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7YF-0004n4-W1 for patch@linaro.org; Thu, 11 Sep 2014 12:48:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7V4-00088L-Eo for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XS7Ux-0004Ck-MC for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:38 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:61393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7Ux-0004CY-B3 for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:31 -0400 Received: by mail-wi0-f173.google.com with SMTP id em10so1309668wid.0 for ; Thu, 11 Sep 2014 09:45:23 -0700 (PDT) X-Received: by 10.181.13.116 with SMTP id ex20mr3965130wid.31.1410453921031; Thu, 11 Sep 2014 09:45:21 -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 ll20sm2078442wic.14.2014.09.11.09.45.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Sep 2014 09:45:20 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Thu, 11 Sep 2014 18:45:12 +0200 Message-Id: <1410453915-9344-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410453915-9344-1-git-send-email-ard.biesheuvel@linaro.org> References: <1410453915-9344-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.173 Cc: christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH v3 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.175 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);