From patchwork Thu Sep 11 16:45:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 388331 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5B2F414011D for ; Fri, 12 Sep 2014 02:48:39 +1000 (EST) Received: from localhost ([::1]:40098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7Xx-0004n6-IU for incoming@patchwork.ozlabs.org; Thu, 11 Sep 2014 12:48:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7V4-00088N-Fm for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XS7Ux-0004Cs-Mo for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:38 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:59478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7Ux-0004CX-BB for qemu-devel@nongnu.org; Thu, 11 Sep 2014 12:45:31 -0400 Received: by mail-wi0-f173.google.com with SMTP id em10so1309710wid.0 for ; Thu, 11 Sep 2014 09:45:25 -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=iwvJjsqdUNprTj/+2q5XWgGY3tEbOiSubRFkZuUE2Qs=; b=coNM9FVPv8yVw1VwMhBLewBSalA9UQM7LgmPAv7LWBeWDo+I/AFYj7VkIWEud/oGP7 W2Lkrw4QM3OxZs0IRjR30xy7I5ciotJOV6OlVe6Ypg8QzlMWILy80HQxW+1Aqgcr7W8W Pjkuj9USDj/f/cjJbM5XDYK5bumOPipncvx4FjqNV8yWtacbpu0AZ9zk0z9ngYfFfUEp JRDgxNGUrXiT22jw5NQ9DBdXut+XzWlFFAPY8usOqCKhizwFetequtk0PpZe5uobY50B U3BVRAbJNHK744Zhhwofsie7xSyCJfn7oUYo86QrPJ6Q+70M5IgnF46Fel0jTBN32Bht rmfw== X-Gm-Message-State: ALoCoQmVF+OqcL4I4fd9YnQYQlHvKRiMDiqN5oUFMLL+J2kaCC1x5QNRzE0O3eiOSD6JyfAgwOX+ X-Received: by 10.180.94.161 with SMTP id dd1mr4116566wib.22.1410453925305; Thu, 11 Sep 2014 09:45:25 -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.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Sep 2014 09:45:24 -0700 (PDT) From: Ard Biesheuvel To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Thu, 11 Sep 2014 18:45:15 +0200 Message-Id: <1410453915-9344-5-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 4/4] hw/arm/boot: enable DTB support when booting ELF images 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 support for loading DTB images when booting ELF images using -kernel. If there are no conflicts with the placement of the ELF segments, the DTB image is loaded at the base of RAM. Signed-off-by: Ard Biesheuvel --- hw/arm/boot.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 1bed02db6fdd..c8dc34f0865b 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -482,7 +482,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) int kernel_size; int initrd_size; int is_linux = 0; - uint64_t elf_entry; + uint64_t elf_entry, elf_low_addr, elf_high_addr; int elf_machine; hwaddr entry, kernel_load_offset; int big_endian; @@ -549,7 +549,25 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) /* Assume that raw images are linux kernels, and ELF images are not. */ kernel_size = load_elf(info->kernel_filename, NULL, NULL, &elf_entry, - NULL, NULL, big_endian, elf_machine, 1); + &elf_low_addr, &elf_high_addr, big_endian, + elf_machine, 1); + if (kernel_size > 0 && have_dtb(info)) { + /* If there is still some room left at the base of RAM, try and put + * the DTB there like we do for images loaded with -bios or -pflash. + */ + if (elf_low_addr > info->loader_start + || elf_high_addr < info->loader_start) { + /* Pass elf_low_addr as address limit to load_dtb if it may be + * pointing into RAM, otherwise pass '0' (no limit) + */ + if (elf_low_addr < info->loader_start) { + elf_low_addr = 0; + } + if (load_dtb(info->loader_start, info, elf_low_addr) < 0) { + exit(1); + } + } + } entry = elf_entry; if (kernel_size < 0) { kernel_size = load_uimage(info->kernel_filename, &entry, NULL,