From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-x22b.google.com (mail-io0-x22b.google.com [IPv6:2607:f8b0:4001:c06::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 27272219392E7 for ; Tue, 4 Apr 2017 08:02:37 -0700 (PDT) Received: by mail-io0-x22b.google.com with SMTP id b140so97423780iof.1 for ; Tue, 04 Apr 2017 08:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=6ZPpF7ll7ICBMSDUrsfNDgYyjfTCx+MZk1LIGEQdrJs=; b=HmXnRVjiLGkjYJwjeGKs6aM2BR7XPKVtbzSBNGQWxTc3hDmVMpnYUxwxyeA5SyghO6 VC6rj7c1qRznuD+8kLBsWp5PEKFdFEfLDlzaWSJmvByxUTWcZ6vqznuEe6qlp4dCkJq9 Ro+QGQSvg2Xa3lbS2Av++OLkslozSFl0XvTaM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=6ZPpF7ll7ICBMSDUrsfNDgYyjfTCx+MZk1LIGEQdrJs=; b=gNcUJP/XOiCDsLMz6VwhrmliWsXq891LeUaEzCrmpvLNWSQcUUpn2LOFPkLJnLShJ+ n1mon3O4ODaF6Wn3xBlsNfsnCHVimdx+PUkFzBkKhvVGdfUEXepIUt00FeYcttOxknj1 Wjm9ji3UOj8IFN4fnXohnRsp/JbZn0ig57QJeX4FfGPnHN2ObCxf5sBkd14+tsdzPXQ1 dKh+7ajWhEZ+AUBxDBFWpyCcpex6a4l3g8toQ9JYh32uG8A8nmOh3ECCWH4Fqwt4Uhcs glBSyPwSnQGX8CdYWfzuIYMY9Qf+O9fsNgV+bEaCoqKCYm/aheAXaUefpbXZ0lEc0uhI TI4w== X-Gm-Message-State: AFeK/H1de2Q5tphAqFXAzDg7yqfVerk5O39P5pKxfC96NpYCcsH2iDP2/akc2ZQajhNOlIaZD72cKwG1M8HSPAy2 X-Received: by 10.107.168.21 with SMTP id r21mr21237521ioe.45.1491318156342; Tue, 04 Apr 2017 08:02:36 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.10.27 with HTTP; Tue, 4 Apr 2017 08:02:35 -0700 (PDT) In-Reply-To: References: <20170404144553.17976-1-ard.biesheuvel@linaro.org> From: Ard Biesheuvel Date: Tue, 4 Apr 2017 16:02:35 +0100 Message-ID: To: Laszlo Ersek Cc: "edk2-devel@lists.01.org" , Jens Wiklander 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 15:02:37 -0000 Content-Type: text/plain; charset=UTF-8 On 4 April 2017 at 15:59, Laszlo Ersek wrote: > 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 Thanks. Pushed as 4d2ea2616e94