From patchwork Tue Jun 16 09:44:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 49955 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B95EB228FA for ; Tue, 16 Jun 2015 09:44:28 +0000 (UTC) Received: by labnp3 with SMTP id np3sf3219389lab.1 for ; Tue, 16 Jun 2015 02:44:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:reply-to:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=AbvFvqnSmnTgRkkZKy4LipSWejeP4eSpfW5b9m1Je4k=; b=WbO00rlU/0dh6/so9tGk60Xvxir5QcjNZ0rfBrtIuqJjUCTJyop6NT32jAG67Kl+r3 6PoTfACEldV3g09VuDCcd1fFHATZhzBubjtThdkLu45EkFdyQPNk0Mv6d8dyOwYcIRWb 7FZVI/3xgl3kl2wmn9i1zEdffEyBA3b7W1jOtg53RraAmakDYOtTgAGR8iKD1Cj3Msg1 VgzY8s/aTv8TESSoOy+qEI6eMRdqiJWI5xb5ONdtodRsev2X1bfYOXCarenENJbd8OpE 5KTblMjMwgdeXQLyFRQ3SI07GP5SsfMVX6n6s7vFVXhCtbh3+wcQPn6qlxB6mkdTo+UW iP1Q== X-Gm-Message-State: ALoCoQlU8d3nF64Bs3tB3ZsNSbJOlnpTaRmRq20G9UZ7mBOH5q1DqKL0DY3T0PIeNP/qkDnnHmG9 X-Received: by 10.112.171.41 with SMTP id ar9mr4783956lbc.24.1434447867720; Tue, 16 Jun 2015 02:44:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.201 with SMTP id ao9ls70095lac.9.gmail; Tue, 16 Jun 2015 02:44:27 -0700 (PDT) X-Received: by 10.112.156.97 with SMTP id wd1mr5624891lbb.30.1434447867555; Tue, 16 Jun 2015 02:44:27 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id y10si355126lal.136.2015.06.16.02.44.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2015 02:44:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbwc1 with SMTP id wc1so7115184lbb.2 for ; Tue, 16 Jun 2015 02:44:27 -0700 (PDT) X-Received: by 10.112.55.207 with SMTP id u15mr3770883lbp.88.1434447867428; Tue, 16 Jun 2015 02:44:27 -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.112.108.230 with SMTP id hn6csp1991425lbb; Tue, 16 Jun 2015 02:44:26 -0700 (PDT) X-Received: by 10.50.78.170 with SMTP id c10mr2245494igx.0.1434447865590; Tue, 16 Jun 2015 02:44:25 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id d133si343876ioe.17.2015.06.16.02.44.24 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 16 Jun 2015 02:44:25 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Z4nPj-0008Vf-AX; Tue, 16 Jun 2015 09:44:15 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Z4nPi-0008VV-2t for edk2-devel@lists.sourceforge.net; Tue, 16 Jun 2015 09:44:14 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.181 as permitted sender) client-ip=209.85.212.181; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wi0-f181.google.com; Received: from mail-wi0-f181.google.com ([209.85.212.181]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1Z4nPh-0006oo-AJ for edk2-devel@lists.sourceforge.net; Tue, 16 Jun 2015 09:44:14 +0000 Received: by wifx6 with SMTP id x6so13694919wif.0 for ; Tue, 16 Jun 2015 02:44:07 -0700 (PDT) X-Received: by 10.180.86.198 with SMTP id r6mr41930559wiz.70.1434447847264; Tue, 16 Jun 2015 02:44:07 -0700 (PDT) Received: from localhost.localdomain (ip16-2-212-87.adsl2.static.versatel.nl. [87.212.2.16]) by mx.google.com with ESMTPSA id z9sm19911640wiv.9.2015.06.16.02.44.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Jun 2015 02:44:06 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, lersek@redhat.com Date: Tue, 16 Jun 2015 11:44:00 +0200 Message-Id: <1434447840-28715-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1Z4nPh-0006oo-AJ Subject: [edk2] [PATCH] ArmVirtPkg: increase memory preallocations for secure build X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net 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.217.181 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 This is a followup to r17554 ("ArmVirtPkg: increase memory preallocations to reduce region count") that increases the sizes of the preallocated regions to account for the footprint of the crypto and authentication libraries. This is only done if secure boot is enabled at build time, to prevent imposing a larger minimum RAM size on non-secure builds. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 9c737712d45f..c6e684fd8512 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -329,9 +329,15 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0 +!if $(SECURE_BOOT_ENABLE) == TRUE + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|600 + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|400 + gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1500 +!else gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|300 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|150 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1000 +!endif gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData|20000 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0