From nobody Wed Dec 25 01:28:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1512051338979886.1710371483006; Thu, 30 Nov 2017 06:15:38 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 130C72211B425; Thu, 30 Nov 2017 06:11:10 -0800 (PST) Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) (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 AC6EA220F3C3D for ; Thu, 30 Nov 2017 06:11:08 -0800 (PST) Received: by mail-wr0-x243.google.com with SMTP id x49so6719849wrb.13 for ; Thu, 30 Nov 2017 06:15:34 -0800 (PST) Received: from localhost.localdomain ([105.150.171.234]) by smtp.gmail.com with ESMTPSA id f19sm2303555wmf.5.2017.11.30.06.15.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 06:15:31 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::243; helo=mail-wr0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org 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; bh=I+Dh4upPrO+3A8kSXTtJANdPPmfE2ysDydCu0CN1X64=; b=f1npmZh+xeWEFKPp0RHeI9nbiBIJQ6rdhPq/h10aOjMlK1h0ONSz1oCVhjobYBoaPo WDiqV2zWioASt0uWiZqdOH7npwQp+Jlzy04syY2Res4warsX75q7iXZQ21OZvXs2HwSd 45WTamJM9ybOdUI8HzMsV9vUd2Ze4ozpnGN5s= 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; bh=I+Dh4upPrO+3A8kSXTtJANdPPmfE2ysDydCu0CN1X64=; b=uEJLhwIvTQFiJBrPFXlJm8I5XTu8UU8Bi26+ATTbh1wNEhvMJe+tf2UaEb797+ek07 zq2ZzL+zUVWTFG9eo8KX1ZA413MXaN/jU1ieobMb8h2+RqewjhOTG730mAxZ1pDFMh6h ZkBAucFWkLECc/IvUS5Ll9NzJwy7L4AIPK/RbjSmxImEUr7u8EEv6dfJkdc4etma4Qno 6Wl2kS8tQU1H0XF5/wphlGf71LQgRWqadKtZimz8qY52a20LHd7xmB8Ugjfe/6X/4b7d ZCHyQZA8jAxWiB3Zun1BXl6bVEqhG6bd7r9WEgdw9eV0gjVWKApLYlP71eZDRa9btsIW WwlA== X-Gm-Message-State: AJaThX716yFUVMVXw5Vuhj9B00ebErPiiNllYd4DNNSSOi6HB9rZaF+g tkgUqC9e87GDChJGMGlmPDd6oHz22Yk= X-Google-Smtp-Source: AGs4zMY1yfo9tPFxEPbw6iZR13i3RSZcwx+PMBHHUpCF3XiLORmgzi5maWeA65tmAyedRdk9VcrPNg== X-Received: by 10.223.171.177 with SMTP id s46mr2098052wrc.194.1512051332104; Thu, 30 Nov 2017 06:15:32 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Thu, 30 Nov 2017 14:15:06 +0000 Message-Id: <20171130141509.27230-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171130141509.27230-1-ard.biesheuvel@linaro.org> References: <20171130141509.27230-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 4/7] ArmPlatformPkg: remove ArmPlatformInitializeSystemMemory X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The function ArmPlatformInitializeSystemMemory() is defined by ArmPlatformLib, but is only ever called when using the PrePeiCore flavor of the startup code. Also, none of the remaining upstream platforms actually implement anything in that function in the first place. So let's just remove it altogether. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/ArmPlatformPkg.dec | = 1 - ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c | = 13 ------------- ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c | = 14 -------------- ArmPlatformPkg/Include/Library/ArmPlatformLib.h | = 11 ----------- ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c | = 14 -------------- ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c | = 8 -------- ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf | = 1 - BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c | = 14 -------------- 8 files changed, 76 deletions(-) diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatform= Pkg.dec index e282e76667b1..9d47e459eadc 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dec +++ b/ArmPlatformPkg/ArmPlatformPkg.dec @@ -48,7 +48,6 @@ [PcdsFeatureFlag.common] gArmPlatformTokenSpaceGuid.PcdNorFlashRemapping|FALSE|BOOLEAN|0x00000012 =20 gArmPlatformTokenSpaceGuid.PcdStandalone|TRUE|BOOLEAN|0x00000001 - gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|FALSE|BOOLEAN|= 0x00000002 gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|FALSE|BOOLE= AN|0x00000004 =20 gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked|FALSE|BOOLEAN|0x0= 000003C diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/C= TA15-A7.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CT= A15-A7.c index 93f4d82f1988..a6ddd1b792c9 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7= .c +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7= .c @@ -149,19 +149,6 @@ ArmPlatformInitialize ( return RETURN_SUCCESS; } =20 -/** - Initialize the system (or sometimes called permanent) memory - - This memory is generally represented by the DRAM. - -**/ -VOID -ArmPlatformInitializeSystemMemory ( - VOID - ) -{ -} - EFI_STATUS PrePeiCoreGetMpCoreInfo ( OUT UINTN *CoreCount, diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.= c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c index 11dd7ff1bfb0..7760e8252125 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c @@ -155,20 +155,6 @@ ArmPlatformInitialize ( return RETURN_SUCCESS; } =20 -/** - Initialize the system (or sometimes called permanent) memory - - This memory is generally represented by the DRAM. - -**/ -VOID -ArmPlatformInitializeSystemMemory ( - VOID - ) -{ - // Nothing to do here -} - EFI_STATUS PrePeiCoreGetMpCoreInfo ( OUT UINTN *CoreCount, diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h b/ArmPlatformP= kg/Include/Library/ArmPlatformLib.h index c74d53506fee..3ad4c16066b6 100644 --- a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h +++ b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h @@ -112,17 +112,6 @@ ArmPlatformInitialize ( ); =20 /** - Initialize the system (or sometimes called permanent) memory - - This memory is generally represented by the DRAM. - -**/ -VOID -ArmPlatformInitializeSystemMemory ( - VOID - ); - -/** Return the Virtual Memory Map of your platform =20 This Virtual Memory Map is used by MemoryInitPei Module to initialize th= e MMU on your platform. diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c= b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c index f80a276a04d6..038e955db50a 100644 --- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c +++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c @@ -106,20 +106,6 @@ ArmPlatformInitialize ( return RETURN_SUCCESS; } =20 -/** - Initialize the system (or sometimes called permanent) memory - - This memory is generally represented by the DRAM. - -**/ -VOID -ArmPlatformInitializeSystemMemory ( - VOID - ) -{ - //TODO: Implement me -} - EFI_STATUS PrePeiCoreGetMpCoreInfo ( OUT UINTN *CoreCount, diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg= /MemoryInitPei/MemoryInitPeim.c index e7880d30b1c8..389a2e6f1abd 100644 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c @@ -103,14 +103,6 @@ InitializeMemory ( =20 DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Memory Init PEIM Loaded\n")); =20 - // - // Initialize the System Memory (DRAM) - // - if (!FeaturePcdGet (PcdSystemMemoryInitializeInSec)) { - // In case the DRAM has not been initialized by the secure firmware - ArmPlatformInitializeSystemMemory (); - } - // Ensure PcdSystemMemorySize has been set ASSERT (PcdGet64 (PcdSystemMemorySize) !=3D 0); ASSERT (PcdGet64 (PcdSystemMemoryBase) < (UINT64)MAX_ADDRESS); diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformP= kg/MemoryInitPei/MemoryInitPeim.inf index 2c14a9c826ff..e9b4ea1114be 100644 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf @@ -49,7 +49,6 @@ [Guids] =20 [FeaturePcd] gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob - gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec =20 [FixedPcd] gArmTokenSpaceGuid.PcdFdBaseAddress diff --git a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c b/BeagleBo= ardPkg/Library/BeagleBoardLib/BeagleBoard.c index 3b0244004853..d8eec72b7c2c 100644 --- a/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c +++ b/BeagleBoardPkg/Library/BeagleBoardLib/BeagleBoard.c @@ -101,20 +101,6 @@ ArmPlatformInitialize ( return RETURN_SUCCESS; } =20 -/** - Initialize the system (or sometimes called permanent) memory - - This memory is generally represented by the DRAM. - -**/ -VOID -ArmPlatformInitializeSystemMemory ( - VOID - ) -{ - // We do not need to initialize the System Memory on RTSM -} - VOID ArmPlatformGetPlatformPpiList ( OUT UINTN *PpiListSize, --=20 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel