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: 37271 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C7EB320454 for ; Thu, 11 Sep 2014 16:49:00 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id uq10sf91810253igb.7 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=iwvJjsqdUNprTj/+2q5XWgGY3tEbOiSubRFkZuUE2Qs=; b=F51ggW2kcn6oALpv0aXoEKYjR4US1uImAjDQhuUlbzBwd2QsHJX6rh0qKO7Cq4caXi 5ZnUfGZrHVBE72ODzgk6FzWUFWnu2SJ/MroP4m78l6xz9t+3mGLzGQfFhhmzIu1Ui4PP KNyTav4IaAr+BiIs80XKDXKgHGNWqpR8ImF7r0NtRoP3RskrcVxFJQXpoQS6P6S5lDaG fZBZPuunC8mzaRaxTIizeAw9kg9xou6+IrjoelIDfWxy7Ix8qn6EJ8shL0An/SDOGgjf FG71YhjV9ekIkmy4xfBy7SD1F3iSuhrzErClRVmOru6UCOZrhm54H1LBpv/Kgd58dZlf NkRA== X-Gm-Message-State: ALoCoQmGTBPP5vIqJ9wQesUnDjB7BNdWfU9YHr4xwtyJiVYENMq926own7X7dFJXxDtCLHVnJNPM X-Received: by 10.182.60.36 with SMTP id e4mr1084516obr.3.1410454140286; Thu, 11 Sep 2014 09:49:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.47 with SMTP id w44ls241272qgw.95.gmail; Thu, 11 Sep 2014 09:49:00 -0700 (PDT) X-Received: by 10.220.113.148 with SMTP id a20mr1836929vcq.30.1410454140131; Thu, 11 Sep 2014 09:49:00 -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 uv6si795663vcb.3.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.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hy10so6201888vcb.33 for ; Thu, 11 Sep 2014 09:49:00 -0700 (PDT) X-Received: by 10.52.163.52 with SMTP id yf20mr1500644vdb.40.1410454140023; 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 uj3csp621061vcb; Thu, 11 Sep 2014 09:48:58 -0700 (PDT) X-Received: by 10.140.95.237 with SMTP id i100mr3522821qge.6.1410454137602; Thu, 11 Sep 2014 09:48:57 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id d4si1198732qci.8.2014.09.11.09.48.55 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Sep 2014 09:48:56 -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]:40098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XS7YF-0004n6-O2 for patch@linaro.org; Thu, 11 Sep 2014 12:48:55 -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-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+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 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,