From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CA61F219392E7 for ; Tue, 4 Apr 2017 07:59:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 438683DBE2; Tue, 4 Apr 2017 14:59:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 438683DBE2 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 438683DBE2 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-91.phx2.redhat.com [10.3.116.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60D4992068; Tue, 4 Apr 2017 14:59:45 +0000 (UTC) To: Ard Biesheuvel , edk2-devel@lists.01.org References: <20170404144553.17976-1-ard.biesheuvel@linaro.org> Cc: jens.wiklander@linaro.org From: Laszlo Ersek Message-ID: Date: Tue, 4 Apr 2017 16:59:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170404144553.17976-1-ard.biesheuvel@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 04 Apr 2017 14:59:46 +0000 (UTC) Subject: Re: [PATCH] ArmVirtPkg/ArmVirtQemuKernel: increase slack space for DTB X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Apr 2017 14:59:47 -0000 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 04/04/17 16:45, Ard Biesheuvel wrote: > The relocatable build of ArmVirtQemuKernel is designed to be executed > from RAM, and contains some scratch memory at the start of the image > to use as a stack very early on, and to preserve the DTB image received > from QEMU while it discovers and initializes memory. > > It turns out that 8 KB is a bit on the small side here, especially when > executing with secure world emulation enabled, in which case there are > additional nodes present. > > So increase the slack space to 32 KB. > > While at it, remove a stale Xen reference that was copy/pasted when this > file was created. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel > --- > ArmVirtPkg/ArmVirtQemuKernel.fdf | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf > index 7bc62f6b0b48..55541a1075d8 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf > +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf > @@ -52,15 +52,15 @@ [FD.QEMU_EFI] > ################################################################################ > > # > -# Implement the Linux kernel header layout so that the Xen loader will identify > +# Implement the Linux kernel header layout so that the loader will identify > # it as something bootable, and execute it with a FDT pointer in x0 or r2. > -# This area will be reused to store a copy of the FDT so round it up to 8 KB. > +# This area will be reused to store a copy of the FDT so round it up to 32 KB. > # > -0x00000000|0x00002000 > +0x00000000|0x00008000 > DATA = { > !if $(ARCH) == AARCH64 > 0x01, 0x00, 0x00, 0x10, # code0: adr x1, . > - 0xff, 0x07, 0x00, 0x14, # code1: b 0x2000 > + 0xff, 0x1f, 0x00, 0x14, # code1: b 0x8000 > 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, # text_offset: 512 KB > 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, # image_size: 2 MB > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # flags > @@ -79,7 +79,7 @@ [FD.QEMU_EFI] > 0x00, 0x00, 0xa0, 0xe1, # nop > 0x00, 0x00, 0xa0, 0xe1, # nop > > - 0xf6, 0x07, 0x00, 0xea, # b 0x2000 > + 0xf6, 0x1f, 0x00, 0xea, # b 0x8000 > 0x18, 0x28, 0x6f, 0x01, # magic > 0x00, 0x00, 0x00, 0x00, # start > 0x00, 0x00, 0x20, 0x00, # image size: 2 MB > @@ -87,7 +87,7 @@ [FD.QEMU_EFI] > !endif > } > > -0x00002000|0x001fe000 > +0x00008000|0x001f8000 > gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize > FV = FVMAIN_COMPACT > > Acked-by: Laszlo Ersek