From patchwork Fri Sep 5 15:15:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 386400 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 4FC30140107 for ; Sat, 6 Sep 2014 01:17:45 +1000 (EST) Received: from localhost ([::1]:58424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvGh-0007E8-EC for incoming@patchwork.ozlabs.org; Fri, 05 Sep 2014 11:17:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEh-0003mm-97 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 1XPvEa-0002k5-FB for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:39 -0400 Received: from mail-we0-f172.google.com ([74.125.82.172]:43844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPvEa-0002jn-2F for qemu-devel@nongnu.org; Fri, 05 Sep 2014 11:15:32 -0400 Received: by mail-we0-f172.google.com with SMTP id q59so11968051wes.17 for ; Fri, 05 Sep 2014 08:15:28 -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=M0QL+Hy3EpJHpsEvNSPVvqHgVX+fpaOq0uipjA9x11Y=; b=UUs0sZRXE9TrwNNupvBNWCoj6Fj6WyJNgEy2Hgs4wK1U5K4iHTExm2hc/WMJiehYeM GDFKsJUO8TdX9LyxZhpQUXJi7T4+fqBVHC6O+dTtoGkgqGkS7b67VGlQSPMXIocpuEEa bpV/8iUVusFWRaR/MhwHfXmiekgodfL8dnwtLRa9wf41FbPcmzOwk3rOFH5g8fq0l4hs 5nTPQNKEH0SFw8swbphPwSgnNbGr5HRZ4vvZ3jpHZnVWidzvisnkuYD2nyAktTBielWI eWIRlq3q9bNj5iYMzuGMdjaf6BsWwooez/YaKzvZDmwfxs7K6MS6fw1wgRFgzrGxfTZN 2Sxw== X-Gm-Message-State: ALoCoQm4JexGAThxU1+Bdwkl4KaiyBGXDK2GebuStwj3IlD+gOCao6bRrQTu8WmznFxjmerdL7WC X-Received: by 10.180.99.34 with SMTP id en2mr4785908wib.34.1409930127643; Fri, 05 Sep 2014 08:15:27 -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.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Sep 2014 08:15:27 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Fri, 5 Sep 2014 17:15:22 +0200 Message-Id: <1409930126-28449-3-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.172 Cc: fu.wei@linaro.org, christoffer.dall@linaro.org, Ard Biesheuvel Subject: [Qemu-devel] [PATCH 2/6] hw/arm/boot: return size of loaded DTB from load_dtb() 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 Add a dtb_size output parameter to load_dtb() so that we can find out what its memory footprint is. Signed-off-by: Ard Biesheuvel --- 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 e32f2f415885..c103a8fdc941 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -312,7 +312,8 @@ static void set_kernel_args_old(const struct arm_boot_info *info) } } -static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) +static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, + uint32_t *dtb_size) { void *fdt = NULL; int size, rc; @@ -340,6 +341,9 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo) goto fail; } } + if (dtb_size != NULL) { + *dtb_size = size; + } acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells"); scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells"); @@ -569,7 +573,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) */ hwaddr dtb_start = QEMU_ALIGN_UP(info->initrd_start + initrd_size, 4096); - if (load_dtb(dtb_start, info)) { + if (load_dtb(dtb_start, info, NULL)) { exit(1); } fixupcontext[FIXUP_ARGPTR] = dtb_start;