From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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-Google-Smtp-Source: AFSGD/XAJj8VmnjaGYFVzTB+feGpKU/B4mNWkXzkQC20LLOGA5P+0dGJaheM18jmxu9RH1Cd/upKIQ== 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 Cc: Ard Biesheuvel , Laszlo Ersek , Leif Lindholm , Eric Auger , Andrew Jones , Philippe Mathieu-Daude , Julien Grall 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: [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: , X-List-Received-Date: Wed, 28 Nov 2018 14:34:19 -0000 Content-Transfer-Encoding: 8bit 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(-) 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 -- 2.19.1