From patchwork Tue Jul 19 12:46:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9236989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B86A602F0 for ; Tue, 19 Jul 2016 12:46:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A339205A8 for ; Tue, 19 Jul 2016 12:46:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F26C526929; Tue, 19 Jul 2016 12:46:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6F56E205A8 for ; Tue, 19 Jul 2016 12:46:57 +0000 (UTC) Received: from localhost ([::1]:55644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUQJ-0000jM-VQ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Jul 2016 08:46:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUQ4-0000jE-PL for qemu-devel@nongnu.org; Tue, 19 Jul 2016 08:46:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPUPy-0001qQ-MU for qemu-devel@nongnu.org; Tue, 19 Jul 2016 08:46:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53112) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUPy-0001qF-E2 for qemu-devel@nongnu.org; Tue, 19 Jul 2016 08:46:34 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD78F63E3F; Tue, 19 Jul 2016 12:46:33 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6JCkWEH016812; Tue, 19 Jul 2016 08:46:33 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 3241180FCF; Tue, 19 Jul 2016 14:46:32 +0200 (CEST) Message-ID: <1468932392.28378.124.camel@redhat.com> From: Gerd Hoffmann To: Laszlo Ersek Date: Tue, 19 Jul 2016 14:46:32 +0200 In-Reply-To: <3d9e3ab4-86ae-40a9-3436-c04eb31dc9fa@redhat.com> References: <1468774394-23009-1-git-send-email-marcel@redhat.com> <1468774394-23009-3-git-send-email-marcel@redhat.com> <20160718153459.7aba3a1c@nial.brq.redhat.com> <2c3931eb-ae8b-51c7-5a6b-9166a459c87a@redhat.com> <578D2EC6.6080807@redhat.com> <1468919198.28378.100.camel@redhat.com> <54e1ba41-0a0f-59f9-c24b-bfa054fbba62@redhat.com> <1468925281.28378.121.camel@redhat.com> <3d9e3ab4-86ae-40a9-3436-c04eb31dc9fa@redhat.com> Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 19 Jul 2016 12:46:34 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] edk2 submodule + binaries (Re: [PATCH V5 2/7] tests/acpi: add pxb/pxb-pcie tests) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mst@redhat.com, Ard Biesheuvel , qemu-devel@nongnu.org, pbonzini@redhat.com, Marcel Apfelbaum , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi, > > but not on arm. > > So that should be fixable without too much effort. > > I guess so. > > I'll mention though that "just" for passing in the initrd, the DTB > shouldn't be necessary, at least if the kernel is built with the EFI > stub. Then "initrd=filename" can be passed on the kernel command line, > and the EFI stub should load it, using UEFI services, from the same > directory that the vmlinuz binary (= itself) came from. Well, the kernel command line is passed via fdt too ... Anyway, it's working. cheers, Gerd From b311f8043c5718018c6d361092524d74208c458a Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 19 Jul 2016 14:14:26 +0200 Subject: [PATCH 2/2] arm: make room for larger devicetree "qemu-system-arm -M virt" devicetree is > 64k. Make sure we have enough space for it. Signed-off-by: Gerd Hoffmann --- grub-core/loader/arm/linux.c | 2 ++ include/grub/arm/linux.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c index 106cfc3..5ac0014 100644 --- a/grub-core/loader/arm/linux.c +++ b/grub-core/loader/arm/linux.c @@ -49,9 +49,11 @@ typedef void (*kernel_entry_t) (int, unsigned long, void *); #define LINUX_ZIMAGE_OFFSET 0x24 #define LINUX_ZIMAGE_MAGIC 0x016f2818 +#if 0 /* declared in include/grub/arm/linux.h */ #define LINUX_PHYS_OFFSET (0x00008000) #define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x02000000) #define LINUX_FDT_PHYS_OFFSET (LINUX_INITRD_PHYS_OFFSET - 0x10000) +#endif static grub_size_t get_atag_size (grub_uint32_t *atag) diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h index 059dbba..deb8a9c 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -37,9 +37,9 @@ # include /* On UEFI platforms - load the images at the lowest available address not less than *_PHYS_OFFSET from the first available memory location. */ -# define LINUX_PHYS_OFFSET (0x00008000) +# define LINUX_PHYS_OFFSET (0x00020000) # define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x02000000) -# define LINUX_FDT_PHYS_OFFSET (LINUX_INITRD_PHYS_OFFSET - 0x10000) +# define LINUX_FDT_PHYS_OFFSET (LINUX_INITRD_PHYS_OFFSET - 0x20000) static inline grub_addr_t grub_arm_firmware_get_boot_data (void) { -- 1.8.3.1