From patchwork Wed Nov 28 14:33:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152273 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1163878ljp; Wed, 28 Nov 2018 06:34:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/UGKJauGbcCyQj0Key/bPc1YeY2Qe8lti5JYC6+R8+Sb40pe0UZt9dGCi4QYasqMeRe1NMQ X-Received: by 2002:a63:504d:: with SMTP id q13mr33787095pgl.319.1543415650219; Wed, 28 Nov 2018 06:34:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415650; cv=none; d=google.com; s=arc-20160816; b=tdlsJwoMJdiHjzZPfGkh+QTXNAi4ScshjhRV5zN87Dveb2yHX+bJsoM1sUPh12etQ9 u+uYRbFsJ7XBeW67wZxxSCo8yH0O68BNenxYNV/t2UqsBSWTjtdSocSorm1cPvZTHesP ktPQVBYw9xN/HDp2l1dQoDW38ZVCaNqsqgvQo19JA7QfBi37KOM5AQcU0PFekt0J8Q0U kLijhN8W6+YSch5A60Auy8oC1zE4+P+oHkj4c8z/jUz8pD/zMU5XDXIfHr28Dz4G3ahB BKFtA5eHfaGHlb/Dh6tkhVBtdIwzNhm8exuuy/qj+JffW7AYZlvk8UFuYObtsCk+Ox+R JnfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=tlN3wCoK7Y1Jn7AyhqeFhBVSynr/qKfswSHrsmPMAmI=; b=f4oHbOgDmHUBXpSm9dENm0YGXaiPkVe9eSnp92nFBmM2awCX1bkWO/udRJBoHHiki1 agdqaZ7wjPhgxhMBxXvOr35A0vX7dUPq61oP4jQ6UnjZwyKq9enOZsK/a3N/KyRFGLwP AU7vnADNZP5bhTP0Ll65BH9ubtNLZnts1B1WwtXGiFVgdjkfDdgiWwz2qjpSk5bUtOUr 6oTq9Q4muRV9WFPA92b9rD0gmnCVBzn+/AXXDFhOIf3Xy+TTdmicLuZdj9rDVSL4S4qv 3bYa7rR4j+G2MYe8sAVApQ4xR0EZNDp2DFROfsM+4ze+bNW7e6OHyV0AscHhLZFnIs5S sd3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hWPphP12; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id 12-v6si7856126pfu.2.2018.11.28.06.34.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hWPphP12; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 8C0C22119620D; Wed, 28 Nov 2018 06:34:09 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (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 315312119620A for ; Wed, 28 Nov 2018 06:34:07 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id t27so18571970wra.6 for ; Wed, 28 Nov 2018 06:34:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NowxrHN/EFL0hmRgSJvRYKdw6W0LH0SDQatVITrXCaI=; b=hWPphP12/biOPmcZigZI3PMPy4nNGKbhMmaL7/WIYb0ZcmEzJW+Z8oHY0TNJmFmEzg 8xhPveKReJktgY1uMNIgmkAxHhszMZpGGdOZ/hH2uxuYJTg47H2SUih/eTpl9eSPfBlB 4JbLPvaNxoIplmmtLufEDDf9xmCqeZKed5VW0= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=NowxrHN/EFL0hmRgSJvRYKdw6W0LH0SDQatVITrXCaI=; b=a1UqH2M4BWnsaWoThm4bXYUt5EGcpZYqxJAYALsdq8bjs5o7SDkZ3ncVw0BBJjeseA pPiVdrr1IpxWCgFY5D31HrDWj39xYT3Z+rWw4MOT7jBqeOFXJTksJFBJQBpfI28JyT4e 71guDzbl8x/2gmLBQaxcazn2R6CyTuzDMpOLesfMV5whvrxja8FIR9f+4j7PArD1iDnz LSRPyqE/CmgjiljeWDyzVHdR/eMU3tTxkONCD6ni5AaXTN51Cj0ftc5RUthbYEFjz4Du 919EyTFtpQ3DLyjAe399BlkOjLWeifoSaF76hvMugYL/HQ7/uERDgNSlw9vRCmY2Bf3Q XKwQ== X-Gm-Message-State: AA+aEWaI9r0qJ2OcIFWNBB8Ld8oVIt7tB+v87FnNG9ZnDcZL0yG5heEH 9BIz44d5fSxpqf6mj4ak12FT/XtYnWA= X-Received: by 2002:adf:dd06:: with SMTP id a6mr33351216wrm.2.1543415645356; Wed, 28 Nov 2018 06:34:05 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:04 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:42 +0100 Message-Id: <20181128143357.991-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 01/16] EmbeddedPkg/TemplateSec: remove unused module X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove this module: it is unused, and should not be used as an example going forward. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- EmbeddedPkg/TemplateSec/TemplateSec.inf | 65 ----------------- EmbeddedPkg/TemplateSec/TemplateSec.c | 76 -------------------- 2 files changed, 141 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/EmbeddedPkg/TemplateSec/TemplateSec.inf b/EmbeddedPkg/TemplateSec/TemplateSec.inf deleted file mode 100644 index 3a63e59294d3..000000000000 --- a/EmbeddedPkg/TemplateSec/TemplateSec.inf +++ /dev/null @@ -1,65 +0,0 @@ -#/** @file -# -# Component description file for DxeIpl module -# -# The responsibility of this module is to load the DXE Core from a Firmware Volume. This implementation i used to load a 32-bit DXE Core. -# -# Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
-# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -#**/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = TemplateSec - FILE_GUID = 1D6F730F-5A55-4078-869B-E0A18324BDC8 - MODULE_TYPE = SEC - VERSION_STRING = 1.0 - - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 ARM -# - -[Sources.common] - TemplateSec.c - -[Sources.Ia32] -# Ia32/ResetVector.asm | MSFT -# Ia32/ResetVector.S | GCC - -[Sources.X64] -# X64/ResetVector.asm | MSFT -# X64/ResetVector.S | GCC - -[Sources.ARM] -# Arm/ResetVector.asm | RVCT -# Arm/ResetVector.S | GCC - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - EmbeddedPkg/EmbeddedPkg.dec - - -[LibraryClasses] - BaseLib - DebugLib - BaseMemoryLib - UefiDecompressLib - PeCoffLib - CacheMaintenanceLib - PrePiLib - -[Pcd] - gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress - gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize - diff --git a/EmbeddedPkg/TemplateSec/TemplateSec.c b/EmbeddedPkg/TemplateSec/TemplateSec.c deleted file mode 100644 index c63adbb6f90f..000000000000 --- a/EmbeddedPkg/TemplateSec/TemplateSec.c +++ /dev/null @@ -1,76 +0,0 @@ -/** @file - - Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
- - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include - -#include -#include -#include - -#include - -VOID -_ModuleEntryPoint ( - VOID - ) -{ -} - -VOID -CEntryPoint ( - VOID *MemoryBase, - UINTN MemorySize, - VOID *StackBase, - UINTN StackSize - ) -{ - EFI_PHYSICAL_ADDRESS MemoryBegin; - UINT64 MemoryLength; - VOID *HobBase; - - // - // Boot strap the C environment so the other library services will work properly. - // - MemoryBegin = (EFI_PHYSICAL_ADDRESS)(UINTN)MemoryBase; - MemoryLength = (UINT64)MemorySize; - HobBase = (VOID *)(UINTN)(FixedPcdGet32(PcdEmbeddedFdBaseAddress) + FixedPcdGet32(PcdEmbeddedFdSize)); - CreateHobList (MemoryBase, MemorySize, HobBase, StackBase); - - MemoryBegin = (EFI_PHYSICAL_ADDRESS)(UINTN)StackBase; - MemoryLength = (UINT64)StackSize; - UpdateStackHob (MemoryBegin, MemoryLength); - - DEBUG ((DEBUG_ERROR, "CEntryPoint (%x,%x,%x,%x)\n", MemoryBase, MemorySize, StackBase, StackSize)); - - // - // Add your C code stuff here.... - // - - - // - // Load the DXE Core and transfer control to it - // - - // Give the DXE Core access to our DEBUG and ASSERT infrastructure so this will work prior - // to the DXE version being loaded. Thus we close the debugging gap between phases. - AddDxeCoreReportStatusCodeCallback (); - - //BuildFvHobs (PcdBfvBase, PcdBfvSize, NULL); - - LoadDxeCoreFromFv (NULL, 0); - - // DXE Core should always load and never return - ASSERT (FALSE); -} - From patchwork Wed Nov 28 14:33:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152274 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1163922ljp; Wed, 28 Nov 2018 06:34:12 -0800 (PST) X-Google-Smtp-Source: AFSGD/VPMRnztvwx4U/bZWO9J8hzLsnb7RojpcR5i5QyQYELKav2CkOrv7Jgx2vfDGODrxLWomYS X-Received: by 2002:a17:902:4681:: with SMTP id p1mr37176328pld.184.1543415652652; Wed, 28 Nov 2018 06:34:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415652; cv=none; d=google.com; s=arc-20160816; b=yVEBSBrkTHO5yspjA/cxuLdrsqxbOkRNMGCtfnvANyTTjR2Vfiedasaa6/HzO1lv5d 4z2OnXMhM4WZ3lRQMVrCKhA84WOy5WjbXnsPaFh6L3BIbifwSNTmXycnHmnzpVvqSxyX 0H10XMXQULtb5TN5GnyqEGwvozDLHWzIgd98RRZtHgnyX4dZ0S97GYzyZd7NH7Te/91P /e/QNbvoIxRKX/mkm4KvLAPCb5giomUpLTe8Ltz2g/PRsUjOLoMnnwLiw2kiz8l/c0oz 9VuYXqNOSTR0K1eZfixDK60jfN5oNGyi15/v+u/ieghpaNq55wWXAQKbiry42lfX9W/G bpYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=hw1VCc2AQjkyCWNys/+xVJiA2Not537YRCvS8NhLqis=; b=gaAoVsyTljXdCEl8+X2Mo3iYXBECX3Q2cgJ3Mn0rEo6U+u11ywUcuw4ssLvKrvobV1 y0tzWEz0oZeitM/XNqJshW0Roz6dZTXotzHtLK+L9dFJjUfhumYzWMdR1wi4aNxhUkjH 4Qc0I4CsmJijHPZVcpRCOEhH8Fn0/UjSNwfZFnNu1aAy7GWWAy7+Hv4HBkLtl4EFl0qT jqzd1nzbLIYogVsq5rPo9tNAa8+aq3uX1e2EF2XGUD05aLhrVAC7lzSxAlZWQmXwgNH5 kQuo/eEqOxxTtGXAjQxZuE0jXmsEsCtDzNaOqt+nunjkTa4XxG51r6H5MIeFPczHFlNv AEWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LL5TW2CX; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id y6si7911049pfi.228.2018.11.28.06.34.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LL5TW2CX; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 C352721196210; Wed, 28 Nov 2018 06:34:10 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 1A53C21962301 for ; Wed, 28 Nov 2018 06:34:09 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id 125so2879435wmh.0 for ; Wed, 28 Nov 2018 06:34:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BBMGLk7llGWLq/gTu49g1poV6To6RM0+rommnYLhx6c=; b=LL5TW2CXcbFnLN5KtvH3O744rqFD/KEm5uAZKWwDMJT4sYsquojkXJp1IqrYgYS+5G jzfmdyLFhu6D2zvMDV7mu9GtU70jVhnSyAVz8UlOhPqNKk2rLzi8juK3s3VRrAMcDbHn jS7jsac1mKx941nTS+gy8n3IMLQB1K0frig+0= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=BBMGLk7llGWLq/gTu49g1poV6To6RM0+rommnYLhx6c=; b=WAq6kne4wlJjwSLAjmSt5U3w+sp/PNAh1YrjTnzOpFhtPYLRR+dEwTrgxhzjKI+frB tg5abg3FS1IkslK3V0/mYocDoxj6k9zMXJvGmdPbLVl1NSy2dl/kZN0IXm4pudbmKS6u hYQuk5AVUhhLJQv2aFUNPx7bz2OVfiKTQulXVGj7eQ+0OgKHFjpWojyb6705d5LFtdU/ EUSuVNg/LFb/mVKOg3SkM1Vhn62h0NCzizrIlidlrR5xSxL2ToZ7VDNjbtTRqSbHkxul YbVIoI04eg8gchaOkaM6f9G11aZ4n8ZpRfYH3G2GcL0As8Fj39R8f5MnF+LldcYA00r0 Bszw== X-Gm-Message-State: AA+aEWYpYHyAuH6txFfy3HMMxya0NLyRuGmidPNPg765AEHglxRAsxyt jHY9eDCkwV4R5RhRu36Joyivl1moUuE= X-Received: by 2002:a7b:c315:: with SMTP id k21mr2862211wmj.145.1543415646687; Wed, 28 Nov 2018 06:34:06 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:05 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:43 +0100 Message-Id: <20181128143357.991-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 02/16] EmbeddedPkg/PrePiHobLib: drop CreateHobList() from library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Drop the declaration and the implementation of CreateHoblist(), which is not used anywhere. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- EmbeddedPkg/Include/Library/PrePiLib.h | 18 --------- EmbeddedPkg/Library/PrePiHobLib/Hob.c | 41 -------------------- 2 files changed, 59 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h b/EmbeddedPkg/Include/Library/PrePiLib.h index cf70fca3b619..a857308ecec2 100644 --- a/EmbeddedPkg/Include/Library/PrePiLib.h +++ b/EmbeddedPkg/Include/Library/PrePiLib.h @@ -274,24 +274,6 @@ HobConstructor ( IN VOID *EfiFreeMemoryTop ); -/** - Retrieves the magic value from the PE/COFF header. - - @param Hdr The buffer in which to return the PE32, PE32+, or TE header. - - @return EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC - Image is PE32 - @return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC - Image is PE32+ - -**/ -VOID -CreateHobList ( - IN VOID *MemoryBegin, - IN UINTN MemoryLength, - IN VOID *HobBase, - IN VOID *StackBase - ); - - /** This service enables PEIMs to create various types of HOBs. diff --git a/EmbeddedPkg/Library/PrePiHobLib/Hob.c b/EmbeddedPkg/Library/PrePiHobLib/Hob.c index aff8ea05797b..ba16899a9184 100644 --- a/EmbeddedPkg/Library/PrePiHobLib/Hob.c +++ b/EmbeddedPkg/Library/PrePiHobLib/Hob.c @@ -175,47 +175,6 @@ BuildResourceDescriptorHob ( Hob->ResourceLength = NumberOfBytes; } -/** - - -**/ -VOID -CreateHobList ( - IN VOID *MemoryBegin, - IN UINTN MemoryLength, - IN VOID *HobBase, - IN VOID *StackBase - ) -{ - EFI_HOB_HANDOFF_INFO_TABLE *Hob; - EFI_RESOURCE_ATTRIBUTE_TYPE Attributes; - - Hob = HobConstructor (MemoryBegin,MemoryLength,HobBase,StackBase); - SetHobList (Hob); - - BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize)); - - Attributes =( - EFI_RESOURCE_ATTRIBUTE_PRESENT | - EFI_RESOURCE_ATTRIBUTE_INITIALIZED | - EFI_RESOURCE_ATTRIBUTE_TESTED | - EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE | - EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE | - EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE | - EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE - ); - - BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY, Attributes, (UINTN)MemoryBegin, MemoryLength); - - BuildStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN)StackBase, ((UINTN)MemoryBegin + MemoryLength) - (UINTN)StackBase); - - if (FeaturePcdGet (PcdPrePiProduceMemoryTypeInformationHob)) { - // Optional feature that helps prevent EFI memory map fragmentation. - BuildMemoryTypeInformationHob (); - } -} - - VOID EFIAPI BuildFvHobs ( From patchwork Wed Nov 28 14:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152275 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164003ljp; Wed, 28 Nov 2018 06:34:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/V+YDA9ndwALNsIp7+1mTxhtZZA00R0GR6b1sMMkzC7CLcWQiY/JMiWiFG18G17Yr1ZLsWa X-Received: by 2002:a17:902:4d46:: with SMTP id o6mr35614146plh.302.1543415656602; Wed, 28 Nov 2018 06:34:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415656; cv=none; d=google.com; s=arc-20160816; b=aaB4aihX6CjUCElI6Rtvak+J+MAgKU2CTCoxuWgwDubsWK581xxlH8Chmyl3ur2CAC XeUdBUmV6B9PW9L6ZB5BuG1rSDSyceIODkTo/u9aw8fPP9GETgT7i5fLyxkkaTkKFwOH GHcCqHx6WQX0E7kCoBs2oD7wTCsDRc7nR/1BjX/HUE4yUn0ef2a47DPTDQQWVjWvb3Ea Hnp4UzmS9Y6yAnMshvZvhVMp8X3vQowLQoqhUIy7JE4nVRmAlZRsfdynIr5LQWbMKV31 AracGE2Ncw/44pXGmk+MfwMoxUxSpTWG8aw5n6EUMPMDA6D1WqJcQV0Zxs+xJLASeIig BwvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=0Q7vYqCVA2+r2yG2LqMb/JSeeTSZVkvtgK2LvqcBr4A=; b=q3dRKc0t2XqUBYg4HxCUgIVyRzys9NJF+4ErY//Aj7MsLTg4SbGo7WGC2/g1/Cc+/j lBI92L4Rh7e+6KjsgIZ4lP9Ow47qlFKJSlfPihKpZUVSL5GsYILAUenDMvE1yq06d2u4 +leB/9OTKiQUp1rSenXOY3KwwOUIDtZnWGKKlqUgBG9obrrZgEicXu7cZmYuk3A1WbZs GCBZNsDsvK4GAtpspv4fdjyuMEe6VAXjwYJEmI5IkTvlP7SG7/JtLJlKlm8HnKtWles+ 92LJ0gTbF8a2QvEb6FUyfNC+VwG400vFDrMLbP6VVvzp9pCu3Q8530REz2ZrBtS+NpUj boaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bQHCVAYZ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id a26si7346550pgl.282.2018.11.28.06.34.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bQHCVAYZ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 F1D1D21196215; Wed, 28 Nov 2018 06:34:12 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::343; helo=mail-wm1-x343.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (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 D698121959CB2 for ; Wed, 28 Nov 2018 06:34:09 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id a18so2159224wmj.1 for ; Wed, 28 Nov 2018 06:34:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K5H32o5b+f2+A6FavyKqEpXujCvWiWZ3Daj5aQkD03s=; b=bQHCVAYZGUfanx6xH4atLhS4873homHhZrj5hBUkhYXS94aMAfe0AAhPT9y8IoVEWo 7DYDott7a77EVOUc8CIlMF6FajQlSCiXGePlAMRVbZoIT2CP5yF8eUrZPlD4Lzc6CLn1 ulIvClcJzMBbzaumZUTOjUey//KJ9GSemwMus= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=K5H32o5b+f2+A6FavyKqEpXujCvWiWZ3Daj5aQkD03s=; b=hCvkkA5h19ofb3TIxw+ytaDO8bcDfLGobuGm9+M66oFUKsj1qUilf6Z+yPYtfaiCIr 4hfneht4YzCP+JC1Jifb1LixY7eoaxwR8ylBxGUK7+aL+Hcxovms5HJd2KZD/LtDOuoK 6pQWfUXC2N+/pfm5oBwEtt6SrOqwxthz4HGdsTY85v+sp4tr1Ee84BTEJl7hlWnAVVHT tdunTOna3C3dUJdlzBZ5VJcC8wbxJx9OA0CNFvgZ7MymqUebubaCQpHXKSoERBRrHNSG VSLBI/b5N763a14dc2Ne3V4Ah8wdA5DRkRYbi2tfxovY27/AzgyOOrwxGiPK98nt0p4z gjZA== X-Gm-Message-State: AA+aEWY98kqjtCyKGRUDK1TPOjbQ356/ZQtDu6h9D0yDpOSVwFVmcenR Ht0Df4leC9Z+9OBoV3R9QvR2cHdC1K4= X-Received: by 2002:a1c:70e:: with SMTP id 14mr3107364wmh.139.1543415648011; Wed, 28 Nov 2018 06:34:08 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:07 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:44 +0100 Message-Id: <20181128143357.991-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 03/16] ArmVirtPkg/FdtPciHostBridgeLib: map ECAM and I/O spaces in GCD memory map X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Up until now, we have been getting away with not declaring the ECAM and translated I/O spaces at all in the GCD memory map, simply because we map the entire address space with device attributes in the early PEI code, and so the ECAM space will be mapped wherever it ends up. Now that we are about to make changes to how ArmVirtQemu reasons about the size of the address space, it would be better to get rid of this mapping of the entire address space, since it can get arbitrarily large without real benefit. So start by mapping the ECAM and translated I/O spaces explicitly, instead of relying on the early PEI mapping. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek --- ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf | 1 + ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c | 46 +++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf index 0995f4b7a156..4011336a353b 100644 --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf +++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf @@ -42,6 +42,7 @@ [Packages] [LibraryClasses] DebugLib DevicePathLib + DxeServicesTableLib MemoryAllocationLib PciPcdProducerLib diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c index 5b9c887db35d..ebfa14a349f4 100644 --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c +++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -82,6 +83,33 @@ typedef struct { #define DTB_PCI_HOST_RANGE_IO BIT24 #define DTB_PCI_HOST_RANGE_TYPEMASK (BIT31 | BIT30 | BIT29 | BIT25 | BIT24) +STATIC +EFI_STATUS +MapGcdMmioSpace ( + IN UINT64 Base, + IN UINT64 Size + ) +{ + EFI_STATUS Status; + + Status = gDS->AddMemorySpace (EfiGcdMemoryTypeMemoryMappedIo, Base, Size, + EFI_MEMORY_UC); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, + "%a: failed to add GCD memory space for region [0x%Lx+0x%Lx)\n", + __FUNCTION__, Base, Size)); + return Status; + } + + Status = gDS->SetMemorySpaceAttributes (Base, Size, EFI_MEMORY_UC); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, + "%a: failed to set memory space attributes for region [0x%Lx+0x%Lx)\n", + __FUNCTION__, Base, Size)); + } + return Status; +} + STATIC EFI_STATUS ProcessPciHost ( @@ -266,7 +294,23 @@ ProcessPciHost ( "Io[0x%Lx+0x%Lx)@0x%Lx Mem32[0x%Lx+0x%Lx)@0x0 Mem64[0x%Lx+0x%Lx)@0x0\n", __FUNCTION__, ConfigBase, ConfigSize, *BusMin, *BusMax, *IoBase, *IoSize, IoTranslation, *Mmio32Base, *Mmio32Size, *Mmio64Base, *Mmio64Size)); - return EFI_SUCCESS; + + // Map the ECAM space in the GCD memory map + Status = MapGcdMmioSpace (ConfigBase, ConfigSize); + ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + return Status; + } + + // + // Map the MMIO window that provides I/O access - the PCI host bridge code + // is not aware of this translation and so it will only map the I/O view + // in the GCD I/O map. + // + Status = MapGcdMmioSpace (*IoBase + IoTranslation, *IoSize); + ASSERT_EFI_ERROR (Status); + + return Status; } STATIC PCI_ROOT_BRIDGE mRootBridge; From patchwork Wed Nov 28 14:33:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152276 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164089ljp; Wed, 28 Nov 2018 06:34:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/U+dp5Yn7wCAe9Z+D2kl57Y7nVl3G6N+USj39PF9eHrzZcbmYLLVI9P+NP04BpWJqYR9RzY X-Received: by 2002:a17:902:6502:: with SMTP id b2mr36639552plk.44.1543415660389; Wed, 28 Nov 2018 06:34:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415660; cv=none; d=google.com; s=arc-20160816; b=BbhUPYgunBXMpOoegUmIKuq+u8wGpRreu+SMvekrHx2/1WWaT5PRy3puVjSJcxDh86 1iu3/i0tyd0zmFPURQyj2ISgsoAaWDVKzL5aUfssAEYOzBKUu+57UETMtvufY/LoLpHM qiOvGLk8jfZ3G4s1OcCgBxYzCEWFQA1GI+JP85s6IHR4lsWlb8m5LfHaP5U9hflQOw4l IXZiaT2KQUSnmjP53LoSVbfUcyyGjTMhNegw/L0x2Ezev4riskTZBT4NrA+IerD//j4G f7gaesKGCwBpgD08WmQr4fst3jrf1IjScfljqnU1prIX/1t6qkum3Vz61mbPLrr+37uv oy7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=n9DVmkpPFSAOc8zegIUK7NZXzw+5DQKHmLmy8/zccf0=; b=AwwTNASYf9dSVc5UVAnrgsvrncvYuOsmXmGDs67+djlmbbshzvHXrzQTrcG+ESujGX qBLicc6QB+Mwxq7vmFAOjXv63bsxCiy5dxK+UVy9nnBNDowD2bwzAItKgi9jjQTdza87 nj+lNE2XJGmue2jzqMhTYaKiMlxwVanv4aKK0/o4EejadgmnfWxgm482jAqGxf3i15P8 qEfVrmaK+S98ao/P785wJm1Xiercr7RlUWGIjZqkKeMgjjJdarPhimt3u+S4eAs5ZnMU bomFTXcYsf50SyVzTmSBI2f27MnjIyzv8PdJay/rkaqq0IZOMNpxVlkousgxT+srqKE0 EMvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bOGE0q2M; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id 189si7639272pgh.320.2018.11.28.06.34.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bOGE0q2M; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 2D9E221194888; Wed, 28 Nov 2018 06:34:13 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::342; helo=mail-wm1-x342.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (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 5780B21959CB2 for ; Wed, 28 Nov 2018 06:34:11 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id n133so2810881wmd.4 for ; Wed, 28 Nov 2018 06:34:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oN6/n4R0TK5dkiFzNveAkj6YIhRhLd5Xz+kAjUCqXOk=; b=bOGE0q2MsRfnCzxl6YxSRZukSTG4lqgLgMbVt2//ozBDPfb0jtLwUrDUKggCOtaOA4 Z3X4f4yMPhh2ol8bFbJwgw21Ll4SbX7fpv/xVbDK4k6Zi3nBQkjek//gQsSb/F98yOBb SHRCxf6WFpa2p3361j+Z3oLTifrpJmMvDijz8= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=oN6/n4R0TK5dkiFzNveAkj6YIhRhLd5Xz+kAjUCqXOk=; b=LvrLnbobYKY1IMON2TIOrOHHomllIvrHKQQoSWWtRHapj46tiMkWXl6MJ6OAvDiHR1 9FYC9hXlLQbAUX2GG17rzlfGf0+030kfkKREFZA+yzZooYkWD8Iti63Zn1oHEJ5vYUlb bqDB85nAqU/g/F8Ngejqv9jmTYrLaM0c3r89Sha6hVqqFc9qZEY6hCM1uR+vdj3rxjPr 7wrmV30SIfsyhd//77VeU6QbqA7xCOfFNYAjan/1tnvAnUn+EV7U9QYW/uvppCWqlUBr ZNqcbWrjkPxdMiWGEX0PTbW2vNT+Up4qIfMw01in1BFIsBgPYZyrbzZscGPnQ+FDX9lx m4vQ== X-Gm-Message-State: AA+aEWa1f4pGgk2rqks0nUoPkXdmm2egZ5pegcewMnmtgpNb+Lqjfo6t a/nzVPZecPt7zpe7xaSZnmM58/NIc58= X-Received: by 2002:a1c:7d54:: with SMTP id y81mr2996922wmc.106.1543415649492; Wed, 28 Nov 2018 06:34:09 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:08 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:45 +0100 Message-Id: <20181128143357.991-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 04/16] ArmVirtPkg/QemuVirtMemInfoLib: remove 1:1 mapping of top of PA range X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Currently, we map DRAM as EFI_MEMORY_WB, and the remainder of the entire virtual address space is mapped with EFI_MEMORY_UC attributes, regardless of whether any devices actually reside there. Now that we are relaxing the address space limit to more than 40 bits, mapping all that address space actually takes up more space in page tables than we have so far made available as temporary RAM. So let's get rid of the mapping rather than increasing the available RAM, given that the mapping is not particularly useful anyway. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf | 7 ---- ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf | 7 ---- ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c | 25 +++---------- ArmVirtPkg/Library/QemuVirtMemInfoLib/AArch64/PhysAddrTop.S | 39 -------------------- ArmVirtPkg/Library/QemuVirtMemInfoLib/Arm/PhysAddrTop.S | 24 ------------ 5 files changed, 5 insertions(+), 97 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf index c72a97f9e78a..5c5b841051ad 100644 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf +++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf @@ -24,12 +24,6 @@ [Defines] [Sources] QemuVirtMemInfoLib.c -[Sources.ARM] - Arm/PhysAddrTop.S - -[Sources.AARCH64] - AArch64/PhysAddrTop.S - [Packages] ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec @@ -51,4 +45,3 @@ [Pcd] [FixedPcd] gArmTokenSpaceGuid.PcdFdSize - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf index e4032d3efb53..d12089760b22 100644 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf +++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf @@ -26,12 +26,6 @@ [Sources] QemuVirtMemInfoLib.c QemuVirtMemInfoPeiLibConstructor.c -[Sources.ARM] - Arm/PhysAddrTop.S - -[Sources.AARCH64] - AArch64/PhysAddrTop.S - [Packages] ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec @@ -55,4 +49,3 @@ [Pcd] [FixedPcd] gArmTokenSpaceGuid.PcdFdSize gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c index 760bcc169cf4..0285a11b1d77 100644 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c +++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c @@ -21,11 +21,6 @@ // Number of Virtual Memory Map Descriptors #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 5 -EFI_PHYSICAL_ADDRESS -ArmGetPhysAddrTop ( - VOID - ); - /** Return the Virtual Memory Map of your platform @@ -45,7 +40,6 @@ ArmVirtGetMemoryMap ( ) { ARM_MEMORY_REGION_DESCRIPTOR *VirtualMemoryTable; - UINT64 TopOfMemory; ASSERT (VirtualMemoryMap != NULL); @@ -78,23 +72,14 @@ ArmVirtGetMemoryMap ( VirtualMemoryTable[1].Length = VirtualMemoryTable[0].PhysicalBase; VirtualMemoryTable[1].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; - // Peripheral space after DRAM - TopOfMemory = MIN (1ULL << FixedPcdGet8 (PcdPrePiCpuMemorySize), - ArmGetPhysAddrTop ()); - VirtualMemoryTable[2].PhysicalBase = VirtualMemoryTable[0].Length + VirtualMemoryTable[1].Length; - VirtualMemoryTable[2].VirtualBase = VirtualMemoryTable[2].PhysicalBase; - VirtualMemoryTable[2].Length = TopOfMemory - - VirtualMemoryTable[2].PhysicalBase; - VirtualMemoryTable[2].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; - // Remap the FD region as normal executable memory - VirtualMemoryTable[3].PhysicalBase = PcdGet64 (PcdFdBaseAddress); - VirtualMemoryTable[3].VirtualBase = VirtualMemoryTable[3].PhysicalBase; - VirtualMemoryTable[3].Length = FixedPcdGet32 (PcdFdSize); - VirtualMemoryTable[3].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK; + VirtualMemoryTable[2].PhysicalBase = PcdGet64 (PcdFdBaseAddress); + VirtualMemoryTable[2].VirtualBase = VirtualMemoryTable[2].PhysicalBase; + VirtualMemoryTable[2].Length = FixedPcdGet32 (PcdFdSize); + VirtualMemoryTable[2].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK; // End of Table - ZeroMem (&VirtualMemoryTable[4], sizeof (ARM_MEMORY_REGION_DESCRIPTOR)); + ZeroMem (&VirtualMemoryTable[3], sizeof (ARM_MEMORY_REGION_DESCRIPTOR)); *VirtualMemoryMap = VirtualMemoryTable; } diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/AArch64/PhysAddrTop.S b/ArmVirtPkg/Library/QemuVirtMemInfoLib/AArch64/PhysAddrTop.S deleted file mode 100644 index a1f6a194d59b..000000000000 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/AArch64/PhysAddrTop.S +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2011-2013, ARM Limited. All rights reserved. -# Copyright (c) 2016-2017, Linaro Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# - -#include - -//EFI_PHYSICAL_ADDRESS -//GetPhysAddrTop ( -// VOID -// ); -ASM_FUNC(ArmGetPhysAddrTop) - mrs x0, id_aa64mmfr0_el1 - adr x1, .LPARanges - and x0, x0, #7 - ldrb w1, [x1, x0] - mov x0, #1 - lsl x0, x0, x1 - ret - -// -// Bits 0..2 of the AA64MFR0_EL1 system register encode the size of the -// physical address space support on this CPU: -// 0 == 32 bits, 1 == 36 bits, etc etc -// 6 and 7 are reserved -// -.LPARanges: - .byte 32, 36, 40, 42, 44, 48, -1, -1 - -ASM_FUNCTION_REMOVE_IF_UNREFERENCED diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/Arm/PhysAddrTop.S b/ArmVirtPkg/Library/QemuVirtMemInfoLib/Arm/PhysAddrTop.S deleted file mode 100644 index 9cd81529fb3d..000000000000 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/Arm/PhysAddrTop.S +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2011-2013, ARM Limited. All rights reserved. -# Copyright (c) 2014-2017, Linaro Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# - -#include - -//EFI_PHYSICAL_ADDRESS -//GetPhysAddrTop ( -// VOID -// ); -ASM_FUNC(ArmGetPhysAddrTop) - mov r0, #0x00000000 - mov r1, #0x10000 - bx lr From patchwork Wed Nov 28 14:33:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152277 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164173ljp; Wed, 28 Nov 2018 06:34:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/VRrU8T2vpR04LRMrJznVfXbxH7LSrt7El+4IUKvTwoRt23xMibYJgueiFfCRv7rOIb4OVh X-Received: by 2002:a63:5122:: with SMTP id f34mr32070306pgb.218.1543415664403; Wed, 28 Nov 2018 06:34:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415664; cv=none; d=google.com; s=arc-20160816; b=bmCJWZHufW+ttqY44EoXglF2e2TbSkXfly01xrx4SIPI3IBTsMgwv+JiqZpKBq55gg bbNjgpzl/BXIG7rdyDK/jVsZ7H7PjGLrye59px/PgZ9JpfJslEyglu+gXc/53g5mLVkU PEImA2vt0k/mkrSvZN29iO+yLQ9dGsUuHiv1LIPXZZBo0+f/GPHJVgbGkfWCPLskjUyZ dkVX+7ePTd9ZO9Mn1z/4PwfmkVC9eIkNcERdHMMr84ZjTEO/l7N/22V8wAt3s9HYhK2b MpZIBqT9tMGfph3KAWA4vkYi/j6YXEO5CSWfM0PMiTadTh/0Ewgof5IH/ujMpg0UfTGG fovQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=CaI89xSauGEzimjMVrGl1sD8iZT5EZSF/72DJu4Dy/Q=; b=z8tsZ3scqubiSdpMyYskHZ7ZynvNZqIXEgZE6vvPiEWJC2eC9KKo0Itdc9Pqr62xAd CTlMe5hEfTxAOpTUpWOsDVA/I86qPZsN9iKKiPZYfDiO07DbA3Wnz9dQHAJTQJchQwX3 zh0unokLKyBjJE8nm3zjH1Kf9gZitq/cTeWNLXKcvRUgtt+ybz6u3ism/xYOks0vCbky 7830PRlH7IWC6RTD9f2oJLzE6pA4NW/xgx8cYkPEOMiOF6bc/XT1ejShnr+IXiIiFlyb PSF3gXkn7iZdY4Un2svdBsMWJHggI5jBtIMerirYi2uaUAQU7kviIz3KrKxiPFWSQtK1 D6LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cNoI76Pk; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id z136si7656081pgz.28.2018.11.28.06.34.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cNoI76Pk; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 5989B21196214; Wed, 28 Nov 2018 06:34:15 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::344; helo=mail-wm1-x344.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (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 9DCB921196214 for ; Wed, 28 Nov 2018 06:34:12 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id r11-v6so2840901wmb.2 for ; Wed, 28 Nov 2018 06:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QXIroxK8mtrTqFpjk0U69BxVNsswlB/AGn2AylTo+6s=; b=cNoI76PkjWeiJjeHSFKIlnixMEB7oXx5FstPz2HUnoc7d3Pqz8kC/vMd18yUHKzacX UzbKkEWWqQPxwdbQ7nBfxQhCDiAw5SW+E8YKfLUtgQp9e7uu0QJkzhy96SG6rEwzUYLq CBln72BzDQ4cFn/7jsdKQSfM7cXs6aa2Jasag= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=QXIroxK8mtrTqFpjk0U69BxVNsswlB/AGn2AylTo+6s=; b=tGH3NVlNqoP+I+ps0JIdnuhGQWf2g1YxvdG3VtEbZEr5MNCFYFFTa28quQhrbM7qpZ 0yLKpIlJl9mGhXbotOTcqdgOdhINJEp4KDtJklGv9mZokcEFqF9WNrY2+2H0ed/cvMFr NdcawMSFfKNulaMqJuyFHqKi1MQr3zcmBDwK26gJXYpTET1lHSqYPxmmIDDpptC2ElpP m9Agmscuhll4RwEcCrSlFZb9Nr1lo7b0ZnOeftwhNitn7plJxQN71b5/CMOQNekcJZwi EE44l38c5C+FcjDFRiDoKx+f6RSEskOzMRCU7USR2X11Y912enU7Kfy+sbS3w+z0YGey C+AA== X-Gm-Message-State: AA+aEWadRewLD8VMwh3QHcB8cx4UZamyxyCBvLeST7Ihd0rNiItyn4ii 0ADSsFkX5bvgp6t1BbhA4xYMnNWeQLs= X-Received: by 2002:a1c:e354:: with SMTP id a81mr2941982wmh.142.1543415650742; Wed, 28 Nov 2018 06:34:10 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:09 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:46 +0100 Message-Id: <20181128143357.991-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 05/16] MdePkg/ProcessorBind.h AARCH64: limit MAX_ADDRESS to 48 bits X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" AArch64 supports the use of more than 48 bits for physical and/or virtual addressing, but only if the page size is set to 64 KB, which is not supported by UEFI. So redefine MAX_ADDRESS to cover only 48 address bits. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- MdePkg/Include/AArch64/ProcessorBind.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/MdePkg/Include/AArch64/ProcessorBind.h b/MdePkg/Include/AArch64/ProcessorBind.h index 968c18f915ae..dad75df1c579 100644 --- a/MdePkg/Include/AArch64/ProcessorBind.h +++ b/MdePkg/Include/AArch64/ProcessorBind.h @@ -138,9 +138,9 @@ typedef INT64 INTN; #define MAX_2_BITS 0xC000000000000000ULL /// -/// Maximum legal AARCH64 address +/// Maximum legal AARCH64 address (48 bits for 4 KB page size) /// -#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFFULL +#define MAX_ADDRESS 0xFFFFFFFFFFFFULL /// /// Maximum legal AArch64 INTN and UINTN values. From patchwork Wed Nov 28 14:33:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152278 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164255ljp; Wed, 28 Nov 2018 06:34:29 -0800 (PST) X-Google-Smtp-Source: AFSGD/VjkOJXbE+6wboRycacZwI+fAica+RI7hfDjiJL6Ii0jhC6aqvkGudscrMnLUjw/t4en00Y X-Received: by 2002:a17:902:5ac7:: with SMTP id g7mr37658753plm.212.1543415669140; Wed, 28 Nov 2018 06:34:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415669; cv=none; d=google.com; s=arc-20160816; b=eOUl40Wk3vjc4b9bW7SrjRsQqsv07Z8WTW9iLrgzT88luJYB0yMUf6WV8nVdmOmMS3 pgbBpi6uwEBCqwu/xgf3zpoKLB5SMGNJxfpmWsUla+Mz43f4NX9HYb36tjHX2ZcmRC9y NY0zl29GgpLXIP7U5uM7HjDS8i5fqGwp40fAQyzhJ5y017syL+6bAkomuUKikZqBbiXx rMyVM2JYs52sxOOapGnPfFEX3qDiohoEBMU1RLLUpzP6C16CmsVnYxkqcHlXTlRx7jrj 2237GDG7t6L2s7eNCtoHWkU9lNKMuXjCb6x38y6zlhkxbYz5JywdFXcnCUWPIHei9aQh ba5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=y5SmUWJeebpmLwXDxmvXAVKU7/lCtZHwyOaPjXgq/u0=; b=cbAfTFQ/9nGCvEooz3Lv/eTTgJwk+N3cOEMMucnlSHqjOUEbeKiQHqSalGsz3+s8Ps 4QP3aJiGam/hCGkF62M5lVi7BDT/YlJzDEWYEMtO3spvmV7Z9Mk7aWuFyiGx5RYhvO0n jRe18NJKARBObv++qi4YtvQZkIQiRuG17pr8kKyns1Xc3jU5o7IpVLYzKMHx1D1Eb4Co Y7IiXuzR5XukHLOM3BowJouo+sAVzf+a+8USBFiBwwWfx8Redt+l6Oiy2Rc12qsUKiRa EnUFRD2zPcYvjqj/ibKdFn1PTS7XXEEtUM+E++vYeszJAMwmmDRD1c4H8YiGlypWSHbE Xd6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hMpM2E6A; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id y6si7502679pgb.516.2018.11.28.06.34.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=hMpM2E6A; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 861B921196219; Wed, 28 Nov 2018 06:34:15 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::444; helo=mail-wr1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 ABC592119620A for ; Wed, 28 Nov 2018 06:34:13 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id v6so26518742wrr.12 for ; Wed, 28 Nov 2018 06:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qNHE9q2xToQm2C9o1zkYwWqpPhb6cTf1V+A8xAWUeFo=; b=hMpM2E6AXbJJsrLjnD3zNS7e+BRVGtOHPzURA2qjLlFdIyVSCnVr2e4l9nWKrMRiwm Xh/q4SwkqKdGabqdCSvSQ1MsRJtKzy1+vb2dvkxX9+hO3D2oqcEQjvw7NKTrk/R8tqvC JIsLHHPUJC2/V6HnpyX6n0IMT3LyEeipQkoVQ= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=qNHE9q2xToQm2C9o1zkYwWqpPhb6cTf1V+A8xAWUeFo=; b=q1TNl7+m9H0CxIHpkCuqF/ZPfgLZYqaRRwiWeSJCWyTEv9HP/pjo50R8xlcfdoTMVK JDIWc4Tg45aBx5bLkbFicYBK+b3egSbmxvS7TjUZp9Fepsbamdrm9pX5qSiqf4WgZIY8 2JazVheEQsTYc8LzHyQ0We6d4aGYyTg6rdwVCYYmke3muvvspwdD5DkrRCaeCEoW28CF dCGxSTIhEzmhpS4ZDWNhRQybCMva+uga1rH3Kv6JBPU4H+Zf2eLVwQdSrL206mFtXMPn 0l9rc0ie+vGqBDPUZTkVWH8nhpY5Lbl6QQxZcZyMn8SBjn4UNzOS39a0ZRdiEhGr3VsX 5Lqw== X-Gm-Message-State: AA+aEWbQcE4bAHVDAyuE7YFqxxqH6YVOG74eXTjLjAGptMQfqPjubOWL 46HGy9ixfOVzq18tJQiZ1YGDFL+0oRU= X-Received: by 2002:adf:c042:: with SMTP id c2mr19974074wrf.158.1543415652018; Wed, 28 Nov 2018 06:34:12 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:11 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:47 +0100 Message-Id: <20181128143357.991-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 06/16] ArmPkg/ArmLib: add support for reading the max physical address space size X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Add a helper function that returns the maximum physical address space size as supported by the current CPU. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/Include/Library/ArmLib.h | 6 ++++++ ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S | 17 +++++++++++++++++ ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S | 8 ++++++++ ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm | 8 ++++++++ 4 files changed, 39 insertions(+) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Acked-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h index ffda50e9d767..9a804c15fdb6 100644 --- a/ArmPkg/Include/Library/ArmLib.h +++ b/ArmPkg/Include/Library/ArmLib.h @@ -733,4 +733,10 @@ ArmWriteCntvOff ( UINT64 Val ); +UINTN +EFIAPI +ArmGetPhysicalAddressBits ( + VOID + ); + #endif // __ARM_LIB__ diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S index 1ef2f61f5979..b7173e00b039 100644 --- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S +++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupport.S @@ -196,4 +196,21 @@ ASM_FUNC(ArmWriteSctlr) 3:msr sctlr_el3, x0 4:ret +ASM_FUNC(ArmGetPhysicalAddressBits) + mrs x0, id_aa64mmfr0_el1 + adr x1, .LPARanges + and x0, x0, #0xf + ldrb w0, [x1, x0] + ret + +// +// Bits 0..3 of the AA64MFR0_EL1 system register encode the size of the +// physical address space support on this CPU: +// 0 == 32 bits, 1 == 36 bits, etc etc +// 7 and up are reserved +// +.LPARanges: + .byte 32, 36, 40, 42, 44, 48, 52, 0 + .byte 0, 0, 0, 0, 0, 0, 0, 0 + ASM_FUNCTION_REMOVE_IF_UNREFERENCED diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S index f2a517671f0a..0e9f9d0453e4 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S +++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.S @@ -165,4 +165,12 @@ ASM_FUNC(ArmWriteCpuActlr) isb bx lr +ASM_FUNC (ArmGetPhysicalAddressBits) + mrc p15, 0, r0, c0, c1, 4 // MMFR0 + and r0, r0, #0xf // VMSA [3:0] + cmp r0, #5 // >= 5 implies LPAE support + movlt r0, #32 // 32 bits if no LPAE + movge r0, #40 // 40 bits if LPAE + bx lr + ASM_FUNCTION_REMOVE_IF_UNREFERENCED diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm index 219140c22b13..3eb52875971d 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm +++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupport.asm @@ -169,4 +169,12 @@ isb bx lr + RVCT_ASM_EXPORT ArmGetPhysicalAddressBits + mrc p15, 0, r0, c0, c1, 4 ; MMFR0 + and r0, r0, #0xf ; VMSA [3:0] + cmp r0, #5 ; >= 5 implies LPAE support + movlt r0, #32 ; 32 bits if no LPAE + movge r0, #40 ; 40 bits if LPAE + bx lr + END From patchwork Wed Nov 28 14:33:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152279 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164346ljp; Wed, 28 Nov 2018 06:34:33 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vyq82skio1bAFSdBPZ3tPu/8qNZ23uiS+NQtV1l5El2ng8NrDfgksvZXaBdGHErOfZ1HZk X-Received: by 2002:a63:e711:: with SMTP id b17mr32429425pgi.363.1543415672910; Wed, 28 Nov 2018 06:34:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415672; cv=none; d=google.com; s=arc-20160816; b=kALyHjh7rKvEqlj0Mgpa9API7Ql1Y+AmYGzBAbMkBC2wrCAQ7xA/rKrVOTMr9aBU7c gWJS79ahDyZX7MlqslftI1SpNFeVm8GnUarHWYpYRDSfkzRS2jGD4ETmiNqE/Y2fO8Lt ZKZBMWfvw0vYA4IEZrH4Lw1Xx4MNGL5ZmsZmEvxIU9LIoUMGwEzGm2Yy2c5JAnmfXFvI c4JK0jI/SQ9KIuOl5mwfZ7p8l9YI5oZ6qyxKUXrNIQJWc5W0hJjYYXYz/q4X8bOR/g/t 9HkqGCJD9byLVFBVEYv4RsnW/ib4ZmpDd4nMezgMMWbRppcX7hZCnU78B++689lV0L+h ggZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=R9+PRUTSmCcZJcADcJPBQhzQjx79PhoRoE+lV8gYnp8=; b=lJL75bgybkrT94qwR+08KMcX19B848wyBYaR9u0H3cTr9g4LkXGulf69f4PtMe58d2 b39pfQbT2bfTXLMk1Oz0dVRs/v8y6lF9sXMBX0RHIXjawi7vxPB5+htXTL4cnAng3Zrk vLwNGDaBxf254kzfzFFSPpcCQK38sntGjVRNGUJU9bvSJAcaSTD6aByFlP+F4ZeE5hx3 /SGK5hxVxAZ4RfrKEl5dYOM7VcReau+wq6eJbybt/WgYg93nt6znvSpNWkbFxIIEUJqu p9/786dZAbEQlgCjZSlpO6Mz2jM9w0XsOi9kB9NRw6FwGFBTBE9IlwH5Q4a639FvIzsL tLCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="h/PFUSIG"; 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 Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id f21si7551634pgb.371.2018.11.28.06.34.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:32 -0800 (PST) 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 header.s=google header.b="h/PFUSIG"; 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 B309821196220; Wed, 28 Nov 2018 06:34:17 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::441; helo=mail-wr1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 1579A21196213 for ; Wed, 28 Nov 2018 06:34:15 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id j10so26531344wru.4 for ; Wed, 28 Nov 2018 06:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uETaXBrNv5jsuw8eC89fjrzgEn1ia5ncb6V0hkNlox4=; b=h/PFUSIGa/UaCNebSet6BOi4wmoDSSKsR3DmBoaGtlVycX2YCH8vnQurLMHzcVOQp6 QAJeEZ0wr+1juG1Eqi2c0EWKjSUsKNS0h1b2EKZmiE8+RG+dLoV31360D0A4Pxy6V1g9 JP0+Hsf1Yf9aRiMI5qfTW277jjLQWXjL03ABU= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=uETaXBrNv5jsuw8eC89fjrzgEn1ia5ncb6V0hkNlox4=; b=Gy18HUReyvRg+ABZtjlxA64wMB1s7WxLkd9sMTzXUm7tWuh8YkmhYNjUKiH3Err0ez hnPLHtDQjSA7m5bjHO3W6zwi9srZ8qjTKe9Zk9njXMW9JDzx1FDg4mYbfy4+ElmeJ0Km aPCcsBJbwiHFAN4bbYZtGbd3fCNM7bF1kgpm6IYx8aGkPulrcNZb6ZuYZB0Vmqbo0TDD dfF1wDREawzgMg107zlWthFKMOj+m9bnwrkHPn6tBbu+p5SLIdm00gbLrkKUT2KJPJps RERW5qFcEkNMwrbPBQxx2VVtAn9P+guRJDhgM1dFehPKNCtoVFEZVgrNvGcIgq7owLeh UHAA== X-Gm-Message-State: AA+aEWbAUgRBajd/15FVbg0dFo3dfKoE2cYMLv1amDMsThrACTh3+5OE whwK9aMZpZdu2tIxr/zx4yWfZMGenUc= X-Received: by 2002:a5d:52ca:: with SMTP id r10mr6817784wrv.123.1543415653297; Wed, 28 Nov 2018 06:34:13 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:12 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:48 +0100 Message-Id: <20181128143357.991-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 07/16] ArmVirtPkg/XenVirtMemInfoLib: refactor reading of the PA space size X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Use the new ArmLib helper to read the CPU's physical address limit so we can drop our own homecooked one. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.inf | 6 --- ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.c | 11 +++--- ArmVirtPkg/Library/XenVirtMemInfoLib/AArch64/PhysAddrTop.S | 39 -------------------- ArmVirtPkg/Library/XenVirtMemInfoLib/Arm/PhysAddrTop.S | 24 ------------ 4 files changed, 5 insertions(+), 75 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.inf b/ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.inf index cd4c805a4db9..ae107810e927 100644 --- a/ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.inf +++ b/ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.inf @@ -24,12 +24,6 @@ [Defines] [Sources] XenVirtMemInfoLib.c -[Sources.ARM] - Arm/PhysAddrTop.S - -[Sources.AARCH64] - AArch64/PhysAddrTop.S - [Packages] ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec diff --git a/ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.c b/ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.c index 88ff3167cbfd..6701dec50ea8 100644 --- a/ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.c +++ b/ArmVirtPkg/Library/XenVirtMemInfoLib/XenVirtMemInfoLib.c @@ -18,11 +18,6 @@ STATIC ARM_MEMORY_REGION_DESCRIPTOR mVirtualMemoryTable[2]; -EFI_PHYSICAL_ADDRESS -ArmGetPhysAddrTop ( - VOID - ); - /** Return the Virtual Memory Map of your platform @@ -42,8 +37,12 @@ ArmVirtGetMemoryMap ( OUT ARM_MEMORY_REGION_DESCRIPTOR **VirtualMemoryMap ) { + EFI_PHYSICAL_ADDRESS TopOfAddressSpace; + ASSERT (VirtualMemoryMap != NULL); + TopOfAddressSpace = LShiftU64 (1ULL, ArmGetPhysicalAddressBits ()); + // // Map the entire physical memory space as cached. The only device // we care about is the GIC, which will be stage 2 mapped as a device @@ -51,7 +50,7 @@ ArmVirtGetMemoryMap ( // mVirtualMemoryTable[0].PhysicalBase = 0x0; mVirtualMemoryTable[0].VirtualBase = 0x0; - mVirtualMemoryTable[0].Length = ArmGetPhysAddrTop (); + mVirtualMemoryTable[0].Length = TopOfAddressSpace; mVirtualMemoryTable[0].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK; mVirtualMemoryTable[1].PhysicalBase = 0x0; diff --git a/ArmVirtPkg/Library/XenVirtMemInfoLib/AArch64/PhysAddrTop.S b/ArmVirtPkg/Library/XenVirtMemInfoLib/AArch64/PhysAddrTop.S deleted file mode 100644 index a1f6a194d59b..000000000000 --- a/ArmVirtPkg/Library/XenVirtMemInfoLib/AArch64/PhysAddrTop.S +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2011-2013, ARM Limited. All rights reserved. -# Copyright (c) 2016-2017, Linaro Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# - -#include - -//EFI_PHYSICAL_ADDRESS -//GetPhysAddrTop ( -// VOID -// ); -ASM_FUNC(ArmGetPhysAddrTop) - mrs x0, id_aa64mmfr0_el1 - adr x1, .LPARanges - and x0, x0, #7 - ldrb w1, [x1, x0] - mov x0, #1 - lsl x0, x0, x1 - ret - -// -// Bits 0..2 of the AA64MFR0_EL1 system register encode the size of the -// physical address space support on this CPU: -// 0 == 32 bits, 1 == 36 bits, etc etc -// 6 and 7 are reserved -// -.LPARanges: - .byte 32, 36, 40, 42, 44, 48, -1, -1 - -ASM_FUNCTION_REMOVE_IF_UNREFERENCED diff --git a/ArmVirtPkg/Library/XenVirtMemInfoLib/Arm/PhysAddrTop.S b/ArmVirtPkg/Library/XenVirtMemInfoLib/Arm/PhysAddrTop.S deleted file mode 100644 index 9cd81529fb3d..000000000000 --- a/ArmVirtPkg/Library/XenVirtMemInfoLib/Arm/PhysAddrTop.S +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2011-2013, ARM Limited. All rights reserved. -# Copyright (c) 2014-2017, Linaro Limited. All rights reserved. -# -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# - -#include - -//EFI_PHYSICAL_ADDRESS -//GetPhysAddrTop ( -// VOID -// ); -ASM_FUNC(ArmGetPhysAddrTop) - mov r0, #0x00000000 - mov r1, #0x10000 - bx lr From patchwork Wed Nov 28 14:33:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152280 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164415ljp; Wed, 28 Nov 2018 06:34:36 -0800 (PST) X-Google-Smtp-Source: AFSGD/WLFI/czJI9g57HGV//TjbvbgUBPQNFL5MT9BYvBb+eNehaYRjdeABYiSJTVMcK00qi0xi1 X-Received: by 2002:a17:902:bd46:: with SMTP id b6mr36882813plx.231.1543415676679; Wed, 28 Nov 2018 06:34:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415676; cv=none; d=google.com; s=arc-20160816; b=pPY42J4PgsO5YSNIT3OgycNDhA91JOsQ9+b+xAVhnuvVB4wBbJ1OQaxIKxm/WSKvpn sAFCHZV9bU1tkUmGKhc+02hnqzqrHRkP9RyqRDaRsDHcgptOI1A28qGqotPbuB+i+Obe +vIw0Y+5ursz7BlRJ178I0J5ZyT2X/qSoLY2X5AsrJRBF/qnnTNsnGSlBUGFJYFMT4Bu toGEGDVgCN6Rpq5CSUmUud3tqN0hRNOWlRAz76BrBPJ7ZouvNlDsz0SKu45EHZchfzmr LmPMPVhQ11Vmrd5Ev2ATjuddcIE3JNuI/s53VliNgX94sk3REpG80C/nfJPIGRVayNV1 tDpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=sQNwY62MNm3/PSKYE70dY3KVwJhM4W5yJiIiTcRS6ck=; b=F37e0sB/E5Mf83mgzwV6OCCCqPRCAQQwIvVvYNyv5iINsP6DiIY3XGqj2seB6hfpoU EEobNniyA8je2ms/DYaII69Eo45XRtdRvA5xtIkVlLdGiZHoxCsTqFgu7WrXUg2AlPk6 nGVB/RCQG+pNYn/d7ZYPJrM1Rvc/3ZfZxNppx67Qqmadd0dSYWH92ixKSxFcG+SI6D7l YnIjf7VzFQmKpIXYbT89QTOx4TjLaoCDSuapfi72N0HhKmJ9OgXUXvMI/hNRSWAKBEiJ pPEUiXNL2q6qVVzu3/Zj/Tz5qsmJA0AF3kx4YHyHk4U9pIGyEjMovCqjLkpxA3Artd2A 6ifA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=gpSFQiG3; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id k69si7289074pga.176.2018.11.28.06.34.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=gpSFQiG3; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 E09A021196221; Wed, 28 Nov 2018 06:34:17 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::442; helo=mail-wr1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (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 C56A121196213 for ; Wed, 28 Nov 2018 06:34:16 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id x10so26527901wrs.8 for ; Wed, 28 Nov 2018 06:34:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+MaGAl8WwjtCUc+2+Szt8QZrOFeoSkczEiOZPUnj0ms=; b=gpSFQiG33/dceFydAXOH7+8+2rTrlVr7qwz/Zy82T7psEUnWRCp1YY/8k6GkmFNOIt RIrKV80uImAEMFAvETHOt7dsJgas6xUNnBIBsxYq1oF6aBuxbVPDLl9YZo1bduAutddw k5/fgsXkDmsMNF4q+skbKUkLihQW2XkvjauU0= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=+MaGAl8WwjtCUc+2+Szt8QZrOFeoSkczEiOZPUnj0ms=; b=QUYvZ+WlD8mHcCo4MzsrLxVUKoaZ0heg0U+daDWpHsrlwTNJr1nTsswVqEcQg1VWM8 RZgVaJoOHAu4hMrgkScyErwZdkau5TtbR2dxl+I+LnNMUE3qVlkWAU79rQp+wNQDqgaE PCVKTB0axm2/eE/opiLnzaj1+Lbp7Rwb6wAy61YIvVRNWfqJGC6CS6ik4xDagwEsqzPV +uADIz0b4BUGYtoDz2pxxW/P5PwRxC9FRBrgTkdzEQnEAXeEx1VlbF+mp4aw9lFeBOiQ VACnzUQvKIAFDPAdV17Ef0doiYKN2jo6zm0Jct9tTTfXQ6zj4HhVEnkLIH9j7/L0+OwX xnow== X-Gm-Message-State: AA+aEWZ1fmUf8uIrIBefBiwQSzZMCwpc+jy5wGWX8de4VRuGtHAUWruL kUqaQAxHOLzdZo2FqHNNfRny0K27yHo= X-Received: by 2002:a05:6000:1189:: with SMTP id g9mr33590158wrx.221.1543415654533; Wed, 28 Nov 2018 06:34:14 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:13 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:49 +0100 Message-Id: <20181128143357.991-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 08/16] ArmPkg/ArmMmuLib: take the CPU supported maximum PA space into account X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" In preparation of dropping PcdPrePiCpuMemorySize entirely, base the maximum size of the identity map on the capabilities of the CPU. Since that may exceed what is architecturally permitted when using 4 KB pages, take MAX_ADDRESS into account as well. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 3 --- ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf | 3 --- ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 11 +++++++++-- 3 files changed, 9 insertions(+), 8 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf index b9f264de8d26..246963361e45 100644 --- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf @@ -40,8 +40,5 @@ [LibraryClasses] CacheMaintenanceLib MemoryAllocationLib -[Pcd.AARCH64] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize - [Pcd.ARM] gArmTokenSpaceGuid.PcdNormalMemoryNonshareableOverride diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf index ecf13f790734..f689c193b862 100644 --- a/ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf @@ -35,6 +35,3 @@ [LibraryClasses] ArmLib CacheMaintenanceLib MemoryAllocationLib - -[Pcd.AARCH64] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c index 4b62ecb6a476..5403b8d4070e 100644 --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c @@ -604,8 +604,15 @@ ArmConfigureMmu ( return EFI_INVALID_PARAMETER; } - // Cover the entire GCD memory space - MaxAddress = (1UL << PcdGet8 (PcdPrePiCpuMemorySize)) - 1; + // + // Limit the virtual address space to what we can actually use: UEFI + // mandates a 1:1 mapping, so no point in making the virtual address + // space larger than the physical address space. We also have to take + // into account the architectural limitations that result from UEFI's + // use of 4 KB pages. + // + MaxAddress = MIN (LShiftU64 (1ULL, ArmGetPhysicalAddressBits ()) - 1, + MAX_ADDRESS); // Lookup the Table Level to get the information LookupAddresstoRootTable (MaxAddress, &T0SZ, &RootTableEntryCount); From patchwork Wed Nov 28 14:33:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152281 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164510ljp; Wed, 28 Nov 2018 06:34:41 -0800 (PST) X-Google-Smtp-Source: AFSGD/UM8eZcvkLyeI8JoC3YFnq7fKHkZIWfNzmlVMWKrlkXKCTADIwD3iBWUy/doAjn7xrik3sV X-Received: by 2002:a63:c24c:: with SMTP id l12mr33481533pgg.146.1543415681267; Wed, 28 Nov 2018 06:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415681; cv=none; d=google.com; s=arc-20160816; b=JBOpcdiGG9SupZbF5C89q4LHMWvdX9oX6iJClWCRuIPbZ8/WErjKtmo0MVyVhwYsZ9 zigXEDiRVe6aY5p0o2TQBHZwL1hZ/XisSHpiX9NB2BcLkKr1bk/qYYZHJOOpDbiLEG+m GEX2MeHyPEikDETcSr3vDLjWZmiW0FWv4Bh3TPzYaVjoaOgX5CFfkrcyTLLCKQn/Pof5 029bI7qVjPcAcCtAd5IHtA2luUlHfUT2CGwtGHmr8bX/10fD4lhHD9Qf4TY9tJujUefQ MLN9snJqECnILtzD27LoVg3sSwm6qz30dR8LwLNUkUhzP23za8fXBVuMBae+AxYXL4nR /A/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=t2FxStij5TI28I/D82lmvFk8RJvFxp5GuRpDpqPjEw4=; b=r3CpyWKVynQqEEKOhyHc9QtjFmSVnd1ROwAb2gAGAx3QwKazxrdlbUqvcgXh0NbR7K cpybPTOrKwqj3p7tGC/j254euwJF5UWkgCzzFZTYbkgwLb/p6mhayQgGYBaRRL7Nm9ue KUp5e1ZEsTO0MOIEV4Cuzdghs/HE4A8I62Uv+xsqBkvjGUhXCbFTEqeEbqIHp+9nuhr4 e3rLd4tubmag94bai8R6C8x2MweW17LZ0brlOKixDNSfnnltuzpcJsOjbCDoG3wFURsY B6lDCbQutJr6pZzmwiLxXm8o+o/AiODKe2utb9Zv3TEdWiDome4ZNsPtx8GfUDZCj9Yu 6SEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iRnUMYZw; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id m1si7396384pgm.194.2018.11.28.06.34.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iRnUMYZw; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 1C1CA21196223; Wed, 28 Nov 2018 06:34:21 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::442; helo=mail-wr1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (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 7BE9B2119620F for ; Wed, 28 Nov 2018 06:34:17 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id r10so26513739wrs.10 for ; Wed, 28 Nov 2018 06:34:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ynicutrS9BlDWKykqGtt6Amc2Qylqt/36mhMiGAjv0g=; b=iRnUMYZwfKTEvu63ELuosdwWsUK2T/hfxQYGrvbw4dCdhH6T3XtBv+aIEgrwmd4P+9 u6kilT4WAyfT9KEzIzGRD6N0fn/SAb4Xgqb/C8HBfyfAB+16k+3s4J+79zApv03hgOp6 gYXfyNhbAPQBeZIlN1YT0u+Mg/A8XYKn3XywQ= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ynicutrS9BlDWKykqGtt6Amc2Qylqt/36mhMiGAjv0g=; b=ZdQ8z8YUSaqlYrZsJDuwpn4KbJJ1PSAs/mxB0D3u2d8DzY8X0egKjMjdLWhZ2KFf1L aMbCOAFLsjIAJBwTDrlpUcReR10fDQw1U5Z94XIJAXQURdkuNJbLKgD80wYhgocxV7VO WaTChPU3mcmjE9LB/RtlleFyZvTZcfX/ISiLDQ58lQD2aCeR92kOc4BBe4xLL2gDJbTf mqAdcHrcKiVSc2m5gdc+HY5zir6Mg1c1dlMctoCk8zB6gHggO0LYCLGvz+GvaXRUNBKF 6NcadLFdB2+7rk3tbX7HNmoDel88UoHdUH+CBHWyQkBeNCPSEt2udec1bL2YoAS8WPHq SAUw== X-Gm-Message-State: AA+aEWbnshEBY4nzRGgRWq7zEDkz98NTiQsnHmKDzV5Wm45MkcjabPOJ 8FrmD2/XlflMrVB72XHx0illd69tUYE= X-Received: by 2002:adf:ba8e:: with SMTP id p14mr22608734wrg.230.1543415655835; Wed, 28 Nov 2018 06:34:15 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:14 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:50 +0100 Message-Id: <20181128143357.991-10-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 09/16] ArmPkg/CpuPei: base GCD memory space size on CPU's PA range X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Derive the size of the GCD memory space map directly from the CPU's information registers rather than from the PcdPrePiCpuMemorySize PCD, which will be removed. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/Drivers/CpuPei/CpuPei.inf | 1 - ArmPkg/Drivers/CpuPei/CpuPei.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/ArmPkg/Drivers/CpuPei/CpuPei.inf b/ArmPkg/Drivers/CpuPei/CpuPei.inf index eafccd600983..dcea012fd8f9 100644 --- a/ArmPkg/Drivers/CpuPei/CpuPei.inf +++ b/ArmPkg/Drivers/CpuPei/CpuPei.inf @@ -50,7 +50,6 @@ [Guids] gArmMpCoreInfoGuid [FixedPcd] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize [Depex] diff --git a/ArmPkg/Drivers/CpuPei/CpuPei.c b/ArmPkg/Drivers/CpuPei/CpuPei.c index d54f42acfcc8..e63519ff6481 100644 --- a/ArmPkg/Drivers/CpuPei/CpuPei.c +++ b/ArmPkg/Drivers/CpuPei/CpuPei.c @@ -73,7 +73,7 @@ InitializeCpuPeim ( ArmEnableBranchPrediction (); // Publish the CPU memory and io spaces sizes - BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize)); + BuildCpuHob (ArmGetPhysicalAddressBits (), PcdGet8 (PcdPrePiCpuIoSize)); // Only MP Core platform need to produce gArmMpCoreInfoPpiGuid Status = PeiServicesLocatePpi (&gArmMpCoreInfoPpiGuid, 0, NULL, (VOID**)&ArmMpCoreInfoPpi); From patchwork Wed Nov 28 14:33:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152282 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164603ljp; Wed, 28 Nov 2018 06:34:46 -0800 (PST) X-Google-Smtp-Source: AFSGD/X3iKvimA/zxuWfK5+6CrAsrTmLbBte2d3xpazE+VB4A8Rxt8QJp49UcwCo3eQsayaUqhKh X-Received: by 2002:a17:902:4:: with SMTP id 4mr23671276pla.20.1543415685961; Wed, 28 Nov 2018 06:34:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415685; cv=none; d=google.com; s=arc-20160816; b=whYWBISVoVGzuTYrwyNXUHE8ZyseyvImW+exzX29AKyLik7WIC5XrwbPbeS9FJb7m1 pphd4KriRA4Par5sPU/lCEA9SeNypsfWXnr8/HASR6Et3G8+Xfz3BydpTjTryWNJshhk k4uQA+ezE/YDFcQFtq+y+x2L0WsD08i5k7RirDTR/hDaswuazIIF7I+9mE4oLXkgEuSN 5mmWhTnBynZqfJrqgZ/eb7hY+TcOnjTKl8uoCUFV/Kp2JHULGLKw1oIcSAKOnizRqQrQ 145zMhu+Vi7JkJm2uWYzc/Xk8ZrNv0HRYAoD/udnWaJf7zQ4i6++k5dzlzzz0Xmukguy 3XDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ShehCmIwu+ByyTQU/LpWeoaQAXvMMM67Rv4GSkOinmU=; b=GFhX35PN/ymEcN+kYHxAw1Y7fbTzKvNswnYw3cw6skCJd4bFz33gGGc+e3vUqzkyI8 o45++zqC0M1WfpTrfhYzmPKSf/ur4s9EkyX4tMdgmI/8HeR97N5CncvHSM/XPej2mlmv L6dav9z23NxydxrbVe/FCWpeB0hUmBK0FAobGjdq9hZzrGEjNzalP6Gpp0nY5AU3uPUz BsoHrw16YYYzAxNrw+7F12lrH+qKvlvXOq8RCaiq3HQudZp84zZ2HjghfwTC3tKohRzs NRu8lJYvqU5GAU0yyZKA497s+C0YKXuR0YFCHjwKcSpnJT0UkeKk7QNEw8WXLLqys7EX fV+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=g+hBD1cL; 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 Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id i18si6645766pgl.414.2018.11.28.06.34.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:45 -0800 (PST) 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 header.s=google header.b=g+hBD1cL; 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 5012B21196224; Wed, 28 Nov 2018 06:34:21 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 D73672119621C for ; Wed, 28 Nov 2018 06:34:18 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id 125so2880032wmh.0 for ; Wed, 28 Nov 2018 06:34:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DmIC3LRgfDV9DiB4dlJpGn4KauqSXmeZm5QJ7+nO9O8=; b=g+hBD1cLA9QerVpxYHTRl3ifo9NeGNf2PVWk7XFFDBbPktmx6poIexfuv/kaOB7Sis EIMlsZet68o29zrbuEfBV54wb5VJuBG62w+CR2srz96ZqYOWXeq4CV49CHfbwwG9sWWd yhW8siJqsyFlSLa4x/LBiVWL74jdJyLG8Ti6E= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=DmIC3LRgfDV9DiB4dlJpGn4KauqSXmeZm5QJ7+nO9O8=; b=W4q5hrS/p0AhlwM/OZmIv4kvqb/SBgOfb+2qAN4eibOunJaj1dY9Imbz+Ws4NsmlQ9 zjYBTnONF1t3q0iDw6zINtBQd14lr+f7Qb0BoYCbtDSEKQX11sUwCLI7SJgDOEPvdaaj /dyVdxeY2t+QA65roiTMYbaDo64sRCHudCvIIeRYuR6pbB+yF/ELJmRrLFDUBpgReE5i 5238deGbKK4+Y5kJPzUmG68rwTECcAcB2Wk8y18dkpzQm9fstuGGou3nCD5JVqjsaFdU a6u1UaXo9etT8f6BaXhVc66c0BijKH38bCBtIy2IwPFQK6ey+hIYaJanx+hmLM1v0wsR Vxvg== X-Gm-Message-State: AA+aEWbCe/nsDSl+UP9zmRHx+cGxIRhTigVoEmcTP26nZ2sS8TR2r42L MsWNOsw4FzY3MoFA6Jbowm46QBdJN7Y= X-Received: by 2002:a7b:ca53:: with SMTP id m19mr3194157wml.102.1543415657169; Wed, 28 Nov 2018 06:34:17 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:16 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:51 +0100 Message-Id: <20181128143357.991-11-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 10/16] ArmPlatformPkg/PrePi: base GCD memory space size on CPU's PA range X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Derive the size of the GCD memory space map directly from the CPU's information registers rather than from the PcdPrePiCpuMemorySize PCD, which will be removed. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/PrePi/PeiMPCore.inf | 1 - ArmPlatformPkg/PrePi/PeiUniCore.inf | 1 - ArmPlatformPkg/PrePi/PrePi.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Acked-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf index 242b03175536..7e2ad6fc483d 100644 --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf @@ -97,7 +97,6 @@ [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf index a45cdef4ed91..26328b7e8f67 100644 --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf @@ -90,7 +90,6 @@ [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory diff --git a/ArmPlatformPkg/PrePi/PrePi.c b/ArmPlatformPkg/PrePi/PrePi.c index 02cff7ddc204..245bdded1eb3 100644 --- a/ArmPlatformPkg/PrePi/PrePi.c +++ b/ArmPlatformPkg/PrePi/PrePi.c @@ -115,7 +115,7 @@ PrePiMain ( BuildStackHob (StacksBase, StacksSize); //TODO: Call CpuPei as a library - BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize)); + BuildCpuHob (ArmGetPhysicalAddressBits (), PcdGet8 (PcdPrePiCpuIoSize)); if (ArmIsMpCore ()) { // Only MP Core platform need to produce gArmMpCoreInfoPpiGuid From patchwork Wed Nov 28 14:33:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152283 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164713ljp; Wed, 28 Nov 2018 06:34:52 -0800 (PST) X-Google-Smtp-Source: AFSGD/WBCZph2yaYxF22VwFpiJx8+qdOdMmvkXvckLpsRSbXWb3uLVIbgFQ6jPQ6teb8MQLQOXSC X-Received: by 2002:a17:902:5066:: with SMTP id f35mr33300423plh.78.1543415692541; Wed, 28 Nov 2018 06:34:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415692; cv=none; d=google.com; s=arc-20160816; b=pVt5OeS9ciWsksmQ21JudrquvcZQJQIe82YNuDDS9YRapcCAKZqecULmw4YqUp1SMW deYgl5tUROoCnp6sBhqc5RMQNo9coVh1qFi85IlVI8FBN64CTOgbHvThmjCQII/MKdwD ivxr/0uGeaKOSrW47EvucM/ADEHAPxsVazTeYEXKvY4Q/INJ274YvThkPqwrQBZRRnvg TJF1ttM1dTx5BaqWHLTrMJ6WjiKnNdR7M/FjGJtuTDwukbQb6tjxmvG5g1XIR/aqPaTF WckgzyXDC4O8szs3MGRgrhynMzCKa1H7AsCIu4fRporz31Wpopw7TaGUA2lZINqyCh16 bxiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=xDWo/SmlExwPI5Bkw55W6OiJInKHkC2gim/y5X3nRCg=; b=sO5TkKZ/2e5Nb99oFhidJq/aOy/CQzmzwXHIDkExH4S0N0SizrljdT+NnskwCPyzuH trEgRLBXwhI2pa934XYdaVMtlUStQ3IFvkrc3UTUh4N8aeWRwbctik2GjZmrIp2VvQIC ZxyHENyGK/catbb75xX2BnQi83eRevrqVXgZIFlKgmu4+T98bES7WqxDnU+3I2Ylc3oO wv3VC7Jq6Br4ktJsAg+ATiibl6r2nrRP/nDxQbr5baTcpeIde7P7l+3KjQVysq0Ic50L wWZa5kfg2wPqgWFHSSnVitSnHoIEhn6W8LDLeU37+Fmw4BgjAo82e+WVNOpYkd9IGNgC S3pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ejUF00bo; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id m61si7451769plb.154.2018.11.28.06.34.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ejUF00bo; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 9DDF22119622D; Wed, 28 Nov 2018 06:34:24 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::444; helo=mail-wr1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 AC5112119621C for ; Wed, 28 Nov 2018 06:34:20 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id l9so26514118wrt.13 for ; Wed, 28 Nov 2018 06:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VTw6MXF4TfPCkKPOxZSN+wMK3LwGW18zflElAM/tN3U=; b=ejUF00bo0JcIGt5oLp13BnJWkI5/iywx5Wk29FqlVt5/c0fYBnr80m+sY4f5IjPiGj AXz1plNNI/6WmQfMmQe8wFZ8+VTSxbK4zsJVq3kMtLe6vjAvbnc/sihI4bTZwVKGyWHp z3OJo50YUMnHoe/8zxt3kQqjh4GZ1ks7HeVqs= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=VTw6MXF4TfPCkKPOxZSN+wMK3LwGW18zflElAM/tN3U=; b=MbzVAr/eLnf8ZAk8iudu1RjtL8eNBKOHNpgBSxty7wnbmATDl5C5Z1LEqh6zZHtkom FzK/9oDUiPUW2Sfv81GSZet1IgWYOpG7dJzOH0u2uVCFSMJfkOHc+UdyCLwiBtl0UpW3 JktaTw7o5rXPja+s2cXhXnQwuiZ4LlNaoMGBBbdlhZdUwL5EWwPivkSkDmH5dpcIduUX omHPyaS9wIMeyB8aT6uLoZyezemnQ4GKMZBjRsQf2ZVB2Qgbkn+ZpJHd3gsngADkbBtm GTHpozxCmMsmnthq+rsjR2+kWQvMdP2UtNYrw5BsqBvntY7Hqqprz3sk8oAmEMlHBhzJ 6ZaA== X-Gm-Message-State: AA+aEWYoA+R74qpBP0OYMvDG9s16dfJ83Eje1OelV4mgih/QftpaP9m2 LdG/Icbd1fiRJFMfRSE8r1fJGNdpqNE= X-Received: by 2002:adf:9ec8:: with SMTP id b8mr21159072wrf.164.1543415658550; Wed, 28 Nov 2018 06:34:18 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:17 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:52 +0100 Message-Id: <20181128143357.991-12-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 11/16] ArmVirtPkg/PrePi: base GCD memory space size on CPU's PA range X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Derive the size of the GCD memory space map directly from the CPU's information registers rather than from the PcdPrePiCpuMemorySize PCD, which will be removed. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 1 - ArmVirtPkg/PrePi/PrePi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Acked-by: Laszlo Ersek diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf index 1587bd92f206..034ddb41cb48 100755 --- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf +++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf @@ -85,7 +85,6 @@ [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory diff --git a/ArmVirtPkg/PrePi/PrePi.c b/ArmVirtPkg/PrePi/PrePi.c index f6abe2f2016b..61de6cfd4ae6 100755 --- a/ArmVirtPkg/PrePi/PrePi.c +++ b/ArmVirtPkg/PrePi/PrePi.c @@ -80,7 +80,7 @@ PrePiMain ( BuildStackHob (StacksBase, StacksSize); //TODO: Call CpuPei as a library - BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize)); + BuildCpuHob (ArmGetPhysicalAddressBits (), PcdGet8 (PcdPrePiCpuIoSize)); // Set the Boot Mode SetBootMode (BOOT_WITH_FULL_CONFIGURATION); From patchwork Wed Nov 28 14:33:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152284 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164817ljp; Wed, 28 Nov 2018 06:34:57 -0800 (PST) X-Google-Smtp-Source: AFSGD/UOdnD/GogL6mEVplTTP0iSkP95Sv3jG8/nvW3GncSPrUaoH54uGYJ8peJ2AneZfgChDvEi X-Received: by 2002:a17:902:690c:: with SMTP id j12mr1200501plk.206.1543415697579; Wed, 28 Nov 2018 06:34:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415697; cv=none; d=google.com; s=arc-20160816; b=phICfmRVpUHC1K1iiBLn4nh8GvmxPAXZAyNwD0ieVaAZQE/Cna+uca6FljQfBRh8ae ByGnwzFNkHRVHI7/VGk4bYfYBbMbeKioL6iNRjlpKCoqMSfTvsnOD8xKYVedimWg5Jpr o+fw5eHh9DwWRBNET9HMatxxjGxpFi0u4R/JYRVb9b4/exBApK7uoR2EWb195jaPzPfm 4qtDOxBoWQL0j3xpnSBcqjY+5Pm/t13dq87jX4ISY55waSUueNEnNHPnVrHIQ/AZpjGl /UBgqHM1jUTxKVNLP49B+0oBhxYsCJ2V1s1oM1Fw4ftca9yLvE0nCFCZDAT7/vwGhv0k iG/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=2yrJb1ywv28RrJZEDPoQaSpRKlS8Qtu1Ouo0u1wzUJ0=; b=ySbFq/5J4K0LWdrvDaxJSn7QrdmW1XVRq4mYtmo/Y/KAU4rFUDlqVQR5QwGdVw8LEL sqi2aSYw12L8oqnr9EZoWtdhh1NF4YuZKUNGQd+RvI5WWCNr0Hf7bQxL0w4XAfBnnEnw +QsVp0y/PQUy639W6Uu0lFOhelz/ygSZpwGKjDOZMT8+OMO5N8hFOoijJcD+iGVAwKC7 rq/fzSpRVVMtGDV8wHUAE2KkX+bc49aPWcdMryRQK5Q+mOzrMPjA517k8/txTMkmSLsl WOG3a1OmF9yPRqoE1Uhzxe7/F1B8+NmhpbU0+Pyt4MYsNB72MN507w9/azkVIbLB3obd fOjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=JLqluZJ+; 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 Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id q13si7111226pgj.86.2018.11.28.06.34.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:57 -0800 (PST) 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 header.s=google header.b=JLqluZJ+; 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 CDA1421196232; Wed, 28 Nov 2018 06:34:24 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::343; helo=mail-wm1-x343.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (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 69FA221196226 for ; Wed, 28 Nov 2018 06:34:21 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id n133so2811462wmd.4 for ; Wed, 28 Nov 2018 06:34:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=URUyurxf667iFbDXbP2kN6XPe58zIYvx3JM7hp6HbeI=; b=JLqluZJ+olvYIObBegeHmjIYt/NW9o84DIcMiUDd9fHA9pqu2kHPB/07y++bD1pOl0 7Hebp/ZlCXk5acs+cCVzAykbJ6X6t8rFZlGCK2q9Mh9MHTuoRq9vlmw6ZVeAyIve1v8C HyhLRwqfVZdVEzH+rlR4oL6dz0umk+PwTQd4o= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=URUyurxf667iFbDXbP2kN6XPe58zIYvx3JM7hp6HbeI=; b=R3+uFOkg7awlbvN30WGT68Z8FnYcprfZiLRW0y3LP8e3XjtXtjUuEWHW66tN73aRXr okooREgbN3NB5KX1+6tHc3ebsH613MNFycelFS9O2Y20wxiVS0GEaNzzNTGefG79pehV E+Qh4HhPmmqNPFMAV7Mjy1y0RRxLu6GXe66CDqiFRkgFA97fz3QdCEOroLvKvMJB7GZy 6vCR7Ic/Q+EQl+vZk+QEgUXhA5GVIzNcBvVuCqgCSk4FVWewWnTpBW7mBZ6GCw6R80HL j2OjgzsbQsanrt/VdoemH+7yvIkkkzge91B9kpS9/jIi0T3oJeLtpIN48cY/F74Uc7X8 Foyw== X-Gm-Message-State: AA+aEWaAlglxHzHRte3dSyQCsH4jyKGW7wPbz0AIPyop9rdfuna7RVYe m1P58gYOjQQv4VhvHh6BMTUJxc+H83Q= X-Received: by 2002:a7b:c5d1:: with SMTP id n17mr2972139wmk.152.1543415659695; Wed, 28 Nov 2018 06:34:19 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:18 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:53 +0100 Message-Id: <20181128143357.991-13-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 12/16] BeagleBoardPkg/PrePi: base GCD memory space size on CPU's PA range X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Derive the size of the GCD memory space map directly from the CPU's information registers rather than from the PcdPrePiCpuMemorySize PCD, which will be removed. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- BeagleBoardPkg/PrePi/PeiUniCore.inf | 1 - BeagleBoardPkg/PrePi/PrePi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Philippe Mathieu-Daudé Acked-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/BeagleBoardPkg/PrePi/PeiUniCore.inf b/BeagleBoardPkg/PrePi/PeiUniCore.inf index 3d72bc5b46e1..53c71d8eafc2 100644 --- a/BeagleBoardPkg/PrePi/PeiUniCore.inf +++ b/BeagleBoardPkg/PrePi/PeiUniCore.inf @@ -86,7 +86,6 @@ [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory diff --git a/BeagleBoardPkg/PrePi/PrePi.c b/BeagleBoardPkg/PrePi/PrePi.c index 46f63f40c46e..bc9b0c80b84c 100644 --- a/BeagleBoardPkg/PrePi/PrePi.c +++ b/BeagleBoardPkg/PrePi/PrePi.c @@ -110,7 +110,7 @@ PrePiMain ( BuildStackHob (StacksBase, StacksSize); //TODO: Call CpuPei as a library - BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize)); + BuildCpuHob (ArmGetPhysicalAddressBits (), PcdGet8 (PcdPrePiCpuIoSize)); // Store timer value logged at the beginning of firmware image execution Performance.ResetEnd = GetTimeInNanoSecond (StartTimeStamp); From patchwork Wed Nov 28 14:33:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152285 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164898ljp; Wed, 28 Nov 2018 06:35:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/UA4q+94HElYUUFTyPcZDCIbMk1FGGx46Xn1sjl99RlR8mWlvgpDnvCSkHFttc4pZMBE3md X-Received: by 2002:a63:f844:: with SMTP id v4mr33090902pgj.82.1543415702640; Wed, 28 Nov 2018 06:35:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415702; cv=none; d=google.com; s=arc-20160816; b=nRv+QR/n+sKr6LgyqU01Xic3ChA2uq0sscFYB03U9PiDC+CkvoZA3Vec0uX/yfWPiY Ai5/AxlDYmbMbHL4b5ntRxUL8uG/MaDHkcTCfVrC8LhyRcstRh0vyyMlutZzYccmAoLR lbRyxRPObo1oOClQL/VEzrm/7yqOPGKzgWIYqtUvcB8xkvuGqcd0fomlzAhMv7Wa5ZBG 7qRMecrRA535I3w+rKd1q1ONJclZRrY1Y1a7meVEZR0iC2nhzmecMiBNSwE+IsVBuEVT YxRQ93wf1bmGyshUpfREezaA8Ee0ZhIoPVrk7AvLkoU1l5F4k58hY7bCxMPNpNc19MxQ hITQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gnHmu7jng63GyKAc/x2vdabmAOR/+7d7eudZ/OrncNE=; b=Be2sNae85ui8aPKyz6YPmWaTLLJzd8c69nxcSDqq34a3i+PvzIKISWbefc7AVEeGLT utxpssP58BnOdXiSp5qgzOZyKl9JXV2lV1OpyshiXB92/6fL9EIBRrFFSfSErKcDBPnn D2Vr7dT1Fy/WbVw4thOcwyPqWv4MQvFarwrzwMxVzB5QZL+cXoc1Cy1TjYud+ayz10X+ GrK3FcmrZWsfidavWul2saf5Wdmkc8qpAoInW1+qbOxX3x0inVgl3i8BiKLZsPoJHaws yLQ2yLJfa1fBX1XoYiYRoxeziqybaTrmXigYH2fa1sFVeajPRMT7XQSyK8Ax41NWu/Yo QcHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HTawq8Xy; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id c136si7996090pfc.141.2018.11.28.06.35.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:35:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HTawq8Xy; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 0993321CB74B6; Wed, 28 Nov 2018 06:34:25 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (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 B1F482119621F for ; Wed, 28 Nov 2018 06:34:22 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id t3so26529939wrr.3 for ; Wed, 28 Nov 2018 06:34:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ApOBnBxIBKYfzHatDR5QEYDMU7Y72qSs9yPe8ZYkwiE=; b=HTawq8Xy5MqAx/wwdi5dAi2ULmma5WWCOU5idP3mH2P5Ecinkk9PKBxNuuCK1qfDEF NnjuSSjuqv7zcqHHJE2N0uno/bLeCtSeJg5u3R6CEyYAoxuoz8Z9CAVyEQO8bPu9tGKu gauyz+k3s7n9yI1Oz6xD9Z4bmIKD7ralmp+04= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ApOBnBxIBKYfzHatDR5QEYDMU7Y72qSs9yPe8ZYkwiE=; b=KmuS1OVkat8FmdVELcBnB/AH5UNtGDoFRbgvC8zzHeW8MWsh0c+fWzJ2l1nvKGZhfO 70xtOqHC9NqhEf8EklRv3zG/w+mZh5ooz0saAKmCelt5G4D+/t645TMSX8N2srXbPJ7Y oO2yPYnntx6lYw3jQ7Qq+MaQWHWdc23TDCGkrTT85YxCQNpNCrSsYa6Gf/JRkls5WiLG wYmujLWNK+4CBcgvqYUlxuXX60SZdsn0ufjlwcHcTMDalqtSEfsq2M+J8nTVit4zCeAz SpC6TnD1663h8L6PIdorJbqhVI+kxi4ffKptUZtFphUjETWH3OT77D+B3cpoYR0Qu05Z osbg== X-Gm-Message-State: AA+aEWaqpK/esKdavTU4s9Sc1roAP6AGYqrFin3VqscwnNTD2moiK7E1 myG85qJZuz6RZwITulU0u5uuAKK+a7Y= X-Received: by 2002:adf:fb0d:: with SMTP id c13mr25679076wrr.285.1543415660919; Wed, 28 Nov 2018 06:34:20 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:20 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:54 +0100 Message-Id: <20181128143357.991-14-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 13/16] ArmPlatformPkg/PlatformPei: drop unused PCD references X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Drop some PCD references that are not actually referenced from the PlatformPei code. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf | 3 --- ArmPlatformPkg/PlatformPei/PlatformPeim.inf | 3 --- 2 files changed, 6 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf index 314789d0a990..23bb3f37e766 100644 --- a/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf +++ b/ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf @@ -46,8 +46,5 @@ [FixedPcd] gArmTokenSpaceGuid.PcdFvBaseAddress gArmTokenSpaceGuid.PcdFvSize - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize - gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize - [depex] TRUE diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf index 423b9ab858d1..4934baa838e1 100644 --- a/ArmPlatformPkg/PlatformPei/PlatformPeim.inf +++ b/ArmPlatformPkg/PlatformPei/PlatformPeim.inf @@ -57,9 +57,6 @@ [FixedPcd] gArmTokenSpaceGuid.PcdFvBaseAddress gArmTokenSpaceGuid.PcdFvSize - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize - gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize - [Depex] TRUE From patchwork Wed Nov 28 14:33:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152286 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1164997ljp; Wed, 28 Nov 2018 06:35:07 -0800 (PST) X-Google-Smtp-Source: AFSGD/USZ31RSSXQyGjtODplqYs6SfTM7xJUh8KhvHSa9rG2LJV3xt0AwXGW5WYEngtFfgmaiPxN X-Received: by 2002:a17:902:5a4d:: with SMTP id f13mr38312414plm.49.1543415707825; Wed, 28 Nov 2018 06:35:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415707; cv=none; d=google.com; s=arc-20160816; b=IJtRDz3yWpNRThkhk0nplp11H4iViSVEpcXECQ0AVtOrs20gS6UpPlkNgKzkb/NpqJ +N4CzxioHRWgA9zseqewSi/SYoZv1nQbZJ15BXlFz5Q3MfqPturUNRO7tkcKb5/XH1Jt qUTi7MEJyP9I/RaHk+bpt1PC48ZOkD/0U5NmKqh1GYh6IVnAKEyyUg5FSFZA4nmccUjf Y5fLcH+HbQWHci9fXbjLhks+fZDthtG6kNz7aGtSA+YxCxvMfWDBeR6JUkNjsY071Jo0 jyg+9PZJs8fLHCz2SlNvfpPVGGg/yScxpanv4JlHpmrHdriLq5BLEYUPbpt/Ht/tSDYK zoCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=tXWQDsJL2apF73TLtJFhRvgnrSQfrtmoEjNNCj6jdY0=; b=x/CBjQPJ/RRvoQyCLZmsJB6ttlcGQDGVBGD5yCjhPo96fPpy3VUixNoNVccHe3R7a/ iOnVBmABmE8sjBzUwmh/zvozQgm6LCpOIJY2w6K7EAFpxhiKlgIwk6pCl0tc7QXQjr+s 65YkdS4y8Whs6SphJwzX4sR79PK9Ldyt1Lr1Rz0tWj8cXIJiSVms1hyAFew8nlZ+YLvD WiiOYAaM9ZP4YXP1QinFN5bFCjO0ncFOwUS2h9r9tiPdMhAYCZS7Mk/TNA1Ds3bvwoI5 RobdZ3JyUWVcAu1GTfquSgPGoacZX3JJodNkL+2mXDOWIntJbzppIBQDyGJDOh/yafAP kZZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BtfJZGi6; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id q127si9397190pfq.19.2018.11.28.06.35.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:35:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BtfJZGi6; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 3A03521196238; Wed, 28 Nov 2018 06:34:27 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::342; helo=mail-wm1-x342.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (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 D19472119621D for ; Wed, 28 Nov 2018 06:34:23 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id q26so2788003wmf.5 for ; Wed, 28 Nov 2018 06:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YH7bVCfMD5koTByUpYo/XRh7PETOcqqP/Xbau7IJQLI=; b=BtfJZGi6ja/p1rRFyfXQi+4E3NX5j1CvLiN/XJjQV4TV1wJEwbKGgeB3i1c8Wv+knq cnHUUzhDcr60rDT+tnrIIn7gzwknmYNEBIRZ33i7lMLMldQKkgmCBuyY7MuAeAuXOp2a OUnGDZbd97FxHA8F6GfurORvAPeDy+UyVsqBU= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=YH7bVCfMD5koTByUpYo/XRh7PETOcqqP/Xbau7IJQLI=; b=bSu6v+vXqu47d0PM4/g2O9DIuDjVw//S0NuIso6FI1E+4bJKIPIxM5QXmwXRXW7WGE 20pjwZQ7IPFNdtxD8e9RibjG7pEudILmc9haM3YkBbH7+o7dZuOfFSACqrx0n99rXdsr DU+ZBQx5uGtQP/AzpJUzUCWQt82ddXBRN//ac4g44+6UbdEVaMo+B6oGOYya1T0IDRFD z/MH6DgTLZuwCILvyHALQ6VkG7g2MxjfSukrzc3b+wUYmVvoqViKR45KTI1WzWE8XO+p lgZ0np3d38zBTrgCt+4zlu08VBTLytREjj8bYo46FXOgDMje+G4+NlieUy2mFfpsppxP wmbw== X-Gm-Message-State: AA+aEWYMEgTTvA/KSM0gXsz8W95udvvRjuH2e3ASQfSYSm/UsjPmhUE1 jRMdGQozV2qLrVTOebKLvCeMSJy5G3s= X-Received: by 2002:a1c:1301:: with SMTP id 1-v6mr2997979wmt.4.1543415662100; Wed, 28 Nov 2018 06:34:22 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:21 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:55 +0100 Message-Id: <20181128143357.991-15-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 14/16] EmbeddedPkg/PrePiLib: drop unused PCD reference X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Drop the reference to gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize which is never used. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- EmbeddedPkg/Library/PrePiLib/PrePiLib.inf | 1 - 1 file changed, 1 deletion(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf index de68405098c0..3dba884b1f31 100644 --- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf +++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf @@ -69,7 +69,6 @@ [Protocols] [FixedPcd.common] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory From patchwork Wed Nov 28 14:33:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152287 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1165086ljp; Wed, 28 Nov 2018 06:35:12 -0800 (PST) X-Google-Smtp-Source: AFSGD/XjT2bNWAy4L0xkriUlXar1lc1WFjgcod2d4uGCAvbrN9t5JofqJsUw2TUByzVSiPEZzHQ0 X-Received: by 2002:a62:2702:: with SMTP id n2mr3442659pfn.29.1543415712712; Wed, 28 Nov 2018 06:35:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415712; cv=none; d=google.com; s=arc-20160816; b=JRq8047iPxGhzIipnL+fARm2vIwdbJ+DdbZLygHR+XVWzWpRcQY4Axe+FHiGUl7bTj 5eQ7CxzgMdEPaBSitz2RNkpJXBH+46EMvBa3t3k34L0ugOGk8qxehiPIFRdGUNsyppVU vv4qMtYUfdDTPfYlsVe9DcEDYL2Lizlkul+knn2feHkbFiv2AGg1Mi+h81W7IYA4W872 7EnJS7BCiL7Gs/cJZ3N9Y1juBh4RDHYAV2iZoBpf0HT09N2M4tcm8AyBY+3v4VTxA7jm d0r4S2KuvqmQEpGQX1x3TNDLWx+oS7Iyzw8R6++M054rT/3kyR0mbcnWv5hibe2B1Cx5 36Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=NVhJFQkIGbPh/vcyC1syFYfnQ8tgYrRLxFOROUtn3TQ=; b=sklQ77Mp2RgOG94kHeHsk9fBjOo9LE2xZ3g/nnhYMd/eQ5KxIyrO7c6wTziE323HBs AgrmiRiPQuLbf3fag57wXGz6/LtRewNKOaaC3MKH7pnnOxdwWSndfLmVsEalrJVigSOL Fd7i/1dQ9CFkkc894WwXV1wwd66x30wNOM4ksbkv94dF2PzlScJJYL7PzeiAQLh6Q1Cz jQmZuBYLxBpRPlAzPFqkAb56uVP9yd/+5OZDVuJdlx5GzAkvmThstLFkZaVK5uYNZzPD dpHIn3aW85Ng+rCsVDoN2iAfclamINRdt8PjZ0Td8n7LXmPoHLZ/ENEbDrMKsmKzEFpu qp9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dUSqqJDW; 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 Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id 187si8617472pfb.41.2018.11.28.06.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:35:12 -0800 (PST) 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 header.s=google header.b=dUSqqJDW; 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 66C2A2119623B; Wed, 28 Nov 2018 06:34:27 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (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 438D621D0DE61 for ; Wed, 28 Nov 2018 06:34:25 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id z5so22221391wrt.11 for ; Wed, 28 Nov 2018 06:34:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lt39KwAiezuMfuyOFO+nkoKdSLDDovio3bWzmfY0Zg0=; b=dUSqqJDWvTjAQzjSdHsLYgFM9cyoeEL0GdBR/zSAHyhrUkSb9UMh7XLs0Jz4vM1oNA 1JjV3EEW+e/3Lk5MUkO+yCKYCOKhIz3RtoAFq2SNuu8U4XvbQtTKEeA2B0cyQNoI0Tle 8EHCHA+NnjsPn5/90UbvLGrNkeEF6v/wmxdqs= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lt39KwAiezuMfuyOFO+nkoKdSLDDovio3bWzmfY0Zg0=; b=uYTM58/F45KpHihTAujmfx7ugsz91BeUMaM7xmQMDiWssucCWhOp+Z0PbD5dZn2Oj1 aHr3zI4q9Tie2fhcI/bfuBcuSzUh+N8nZTVSOEeVjvnNDy85ieUiVxDub85YSDmg7Hlq iXwsfThJC0c21CAOrts/NITpASQeieK52+2FNcl/vYLizpWIrqPyOsRPyEZmLXbN74Qp rcTvkcP4+Wp/GuyvCOBXpKkBT/lko+OgKEV7JAhWTwetnj4N7keJDrQjtiYIHnSy7HNv +ngS4EdFLoRKqg8J8v4n1R7OGFxHTodnGO9kHHMU3ES33sVxPemGeM26FO4lfE3DVRZa LHVg== X-Gm-Message-State: AA+aEWYTZZO5u7rSH0YZSKWWZwtWwjofNg8w4SVJeRbBvK4y4DOebzR2 hZ/VngKA7hbMjyRjbOxPWLDEXNrO9p4= X-Received: by 2002:adf:9bda:: with SMTP id e26mr20150247wrc.295.1543415663617; Wed, 28 Nov 2018 06:34:23 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:22 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:56 +0100 Message-Id: <20181128143357.991-16-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 15/16] ArmVirtPkg: drop PcdPrePiCpuMemorySize assignments from all platforms X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" PcdPrePiCpuMemorySize is no longer used so drop the PCD overrides from all platform descriptions in ArmVirtPkg. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 3 --- ArmVirtPkg/ArmVirtQemu.dsc | 4 ---- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ---- 3 files changed, 11 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 70a0ac4d786c..fbdb5c982604 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -388,9 +388,6 @@ [PcdsFixedAtBuild.common] # gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE -[PcdsFixedAtBuild.ARM] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40 - [Components.common] # # Ramdisk support diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 885c6b14b844..a107b6bb5104 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -143,10 +143,6 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16 [PcdsFixedAtBuild.AARCH64] - # KVM limits it IPA space to 40 bits (1 TB), so there is no need to - # support anything bigger, even if the host hardware does - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40 - # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point, # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the # presence of the 32-bit entry point anyway (because many AARCH64 systems diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 434d6861a56f..d8fbf14e8f4e 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -157,10 +157,6 @@ [PcdsFixedAtBuild.AARCH64] # gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16 - # KVM limits it IPA space to 40 bits (1 TB), so there is no need to - # support anything bigger, even if the host hardware does - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40 - [PcdsDynamicDefault.common] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 From patchwork Wed Nov 28 14:33:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 152288 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1165178ljp; Wed, 28 Nov 2018 06:35:17 -0800 (PST) X-Google-Smtp-Source: AFSGD/WVQsJtnBXtyhrRMdP+TzL3dMGTuiojc3CgJ+r4+YwYFIZSd2QvVJkOW8P7H1v9SuvVO0co X-Received: by 2002:a17:902:24d:: with SMTP id 71mr36165881plc.225.1543415717634; Wed, 28 Nov 2018 06:35:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543415717; cv=none; d=google.com; s=arc-20160816; b=0vsQNYvAis7yoFVhClQUExKdLd+Rw5ZMcANlGT0gOhdMMmnBhk7U/p9dREh0ij1u4o 6xN1lv4lgnMMlvKa2QfQ8wPn267yxAVFGbKllBWgK3U1GgPI5aGYC8k/teXq1gIm1ilQ O8TWcgHSJJG3pVk89iUpCxAfQ8t37wsv2x2tjjojTXzwM0Q5SzpYa21x9LoI8ysc8qIq rI4Sha+03R0Bgm1V04hZKYkbc3jOOWMP2MB0Dwloe7W8tczyqNUismyDJ1Qn1GjSn96s IJ0WQQ9MnC0yFX9ssKx+5+R1k/2ikc2k4UUz/v2kr3YiFgsn8SOYcKY2dpyveTHaQHXK Ji4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=QUIxHdMiPaTt7ZBde2OmMXxVzDi1Crz/1XDiIrYKdT4=; b=G3XtY3XA37pirpviJ5YwyWxZFiP2/mzSjZhQBdnoj3htH19WMlofEosQtUdKD/4CJN tR5Qz82ziDlnb0Pb249bZv7mdU7VlbfZ4wT6lObFc8ib52fWlNf1i21EXwX+LgnqtybW wLePukArbxxg7In0fD8LdmMUSqMqanwozbjim0EvN2AIQwdhZsD1FDzCsHtNlamYOfKc +XHe05RYhFNVNIdEQeAZ8jGoATwSlUh1FCyyIRAdDnaE63iostTtN3CRInNuOyXa7lQv q/IpqvIXeMa0DMTtLi+ClezkiVcFkaODgvYNMwx8aGpUWhmEDFJROieVbspVXOgs/cMq KIQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SvXKU+kv; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id f11si7657733plr.341.2018.11.28.06.35.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:35:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SvXKU+kv; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 99D5921196222; Wed, 28 Nov 2018 06:34:29 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::441; helo=mail-wr1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 B3BA621196229 for ; Wed, 28 Nov 2018 06:34:26 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id j2so26564496wrw.1 for ; Wed, 28 Nov 2018 06:34:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ENMkNP6TEOpANgPsv8Dx2Tp/JLt7k0puq/46dEJ1P1k=; b=SvXKU+kvvkc89SU65m12cH6ZfjBCt7c7ew/kL7fLhtKBi5MyoYRxR2lhsvYv2ur5F9 +XARDbC0baaNZMuluhLUotoIml19/2Yxdj1DeBt4so+NL7q4OgF8vHmWGSMDI+/F7I5q nA8i8wdkidVkDn5vyKxvqmUSMn1JfClk4FGlo= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ENMkNP6TEOpANgPsv8Dx2Tp/JLt7k0puq/46dEJ1P1k=; b=cEi6gpzvz9GVUtIukZk2HP6v9/HfjGKvtjPnfSRDeSIzCx7X+DwcAf2RmjNQEVcEQs VdMOb+bjZDLZugJHIGtVd4dVAX/1s4zGzD34/1tsnjwSgtokL3JzXhHztCnpMF9GS3yM ezfcVmKkwwz7MrBgZSlYT7VpiA8Aa7vJXRJZUhJu2q2E1oYBw7orvGWxbKz4mRiw1gW4 pMkMV6Rb+ENGRudzVlYyaG3mMwIof8FSQyjuWtfS3IYIW54eT5It53vTSVUfKrqwKdoh xIHsQO33ntbfHJNi4kWtd84WcTTT7GEX98Ez6qJfbTm+DYh57cidBptCBRMegR4DJDT+ PxyA== X-Gm-Message-State: AA+aEWbuS9gMDCG3waH8lncEOe5i1lr2gqwdnfR1hqs9v3ntPWmeH7tP OYCsCeorjH2P3Y4jO5N/Vv/Wr3jFdGY= X-Received: by 2002:adf:e846:: with SMTP id d6mr32494622wrn.72.1543415665031; Wed, 28 Nov 2018 06:34:25 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:296f:238b:c20d:3626]) by smtp.gmail.com with ESMTPSA id 6sm3391891wmk.26.2018.11.28.06.34.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:34:24 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 28 Nov 2018 15:33:57 +0100 Message-Id: <20181128143357.991-17-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128143357.991-1-ard.biesheuvel@linaro.org> References: <20181128143357.991-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH v3 16/16] EmbeddedPkg/EmbeddedPkg.dec: drop PcdPrePiCpuMemorySize declarations X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Laszlo Ersek Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" PcdPrePiCpuMemorySize is no longer used so drop the declarations from the package DEC file. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- EmbeddedPkg/EmbeddedPkg.dec | 4 ---- 1 file changed, 4 deletions(-) -- 2.19.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek Reviewed-by: Leif Lindholm diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index 28a143865d0e..ff5aab07d745 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -170,22 +170,18 @@ [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdAndroidBootDevicePath|L""|VOID*|0x00000057 [PcdsFixedAtBuild.ARM] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32|UINT8|0x00000010 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011 # ISP1761 USB OTG Controller gEmbeddedTokenSpaceGuid.PcdIsp1761BaseAddress|0|UINT32|0x00000021 [PcdsFixedAtBuild.AARCH64] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|48|UINT8|0x00000010 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011 [PcdsFixedAtBuild.IA32] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|36|UINT8|0x00000010 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011 [PcdsFixedAtBuild.X64] - gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|52|UINT8|0x00000010 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011 [PcdsFixedAtBuild.common, PcdsDynamic.common]