From patchwork Tue Apr 4 14:45:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 96732 Delivered-To: patch@linaro.org Received: by 10.182.246.10 with SMTP id xs10csp263699obc; Tue, 4 Apr 2017 07:46:04 -0700 (PDT) X-Received: by 10.84.231.9 with SMTP id f9mr28734213plk.191.1491317164417; Tue, 04 Apr 2017 07:46:04 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id e65si17697659pfe.229.2017.04.04.07.46.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 07:46:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8FA0F219392E7; Tue, 4 Apr 2017 07:46:03 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::22c]) (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 CC38921A18AAA for ; Tue, 4 Apr 2017 07:46:02 -0700 (PDT) Received: by mail-wm0-x22c.google.com with SMTP id y22so27606309wmh.0 for ; Tue, 04 Apr 2017 07:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=R17zlIQBZEdHT2l9hAGeZjkesvB3ZUHv2Tx5x/q0g14=; b=b5zDjbs+N+4jMyU+unxL4YR3h8+TrKi7Bg1S9G7o36iN9QY3stz2quZyxb7+Y+De4t NzSazxifQ0T2Y/PxlnlnU9lL5++Y6feJ1VYp8hOphLm84UUjR5VdCbIJo7t5XqzVK2wm xvhQ1NGVOjX8tg2i6aVXqd32E3pWBRKOxPqzc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=R17zlIQBZEdHT2l9hAGeZjkesvB3ZUHv2Tx5x/q0g14=; b=oqfmUY/PfvBp7IZv+8dvPNtQ5C6dOLaskcjtjPWiAU4CaVi532Mm+8mbdjJWQkpKQo m4lsOchQvuTzroDXlI/6UbtSyOCda8gvrBbqhJq0Y0KRbB1AzRHFIH7g52pf2FSihRVy KicaE7Lbt8KbXQKd+s8FXkD0ERXe+u2NZYYLBPQt3lPMd8AmvmiSOTaBRyuO+ooqjAL/ UJGaCgA7nSwSZr7/ITiXDPXi1I/5cYY+Bzp8JLSho0kFeGnFCIS/dCwRkFRe9hQ8qFiK xGpcbiv4psYgVJoUEHeCDMUpF0zqK8YCPMfrWhLYAktfm3CbO4P/qTmkAFEWPp1Nqog4 GiHA== X-Gm-Message-State: AFeK/H1RKKjkz9eHsZtDiXCLNlA+Yj0poKaltbOcbNS0gC/hpV8kmdHW4p1a3yJo/eMn7XlS X-Received: by 10.28.46.213 with SMTP id u204mr14773010wmu.136.1491317161223; Tue, 04 Apr 2017 07:46:01 -0700 (PDT) Received: from localhost.localdomain ([160.163.145.113]) by smtp.gmail.com with ESMTPSA id t85sm18691602wmt.23.2017.04.04.07.45.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 07:46:00 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Tue, 4 Apr 2017 15:45:53 +0100 Message-Id: <20170404144553.17976-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 Subject: [edk2] [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: , Cc: jens.wiklander@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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(-) -- 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Acked-by: Laszlo Ersek 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