From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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 5A9D621B00DC8 for ; Fri, 10 Nov 2017 06:17:56 -0800 (PST) Received: by mail-wr0-x243.google.com with SMTP id k61so8744318wrc.4 for ; Fri, 10 Nov 2017 06:21:59 -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; bh=P/tdm3SiCEkh4UACJCMKTJ86wKzG+V8L7SY7FRldEDc=; b=XtEayIQwzRCNKC+J5ZXdjIzwPr1fkb60fsG+mmfFksH9qA4cdC2brVLTV5rgFOWUoH eG2S89dCjAkt74gUTFxMdy6eJv6ZsJcBOizKNJKbjlYqzQiFFuMIxsVcv90E2ZnKyogR ofFm85qMITRttce3jpm2mdJVGtYZGqYzqWJzo= 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=P/tdm3SiCEkh4UACJCMKTJ86wKzG+V8L7SY7FRldEDc=; b=D7UT6zk8omaMsHdgg3adn3ezoges0W3vVVHbcSPEBxNMuJIjONsnL9S2sVUQWIYrp4 yswYApugO8lpv9BZCFotm6MYDRZRsWyE0qyxCMaxwuKcwz9VhEVgSMGvRlAqVQFlo0uv KxSf//MEA1E5f3p9IVxkkOZX3VjsH8ADkFz0xhcWXh3FV/eeydPiILiEFDtbnpztP+qs PYs/b6mahc0iyrHtLBH40ncc0o5eR7IbsO1VaQfDx7Lnfi5IhThkbFumuSSnGsam/jQf /lzyax8ibPauMcQHje5FOVxKFChDpqtolalkGH4wi1Vvg/PFW2RFs4JfQtil5qD8NZCt RrWQ== X-Gm-Message-State: AJaThX5V9e4gmq1jBoa3HxA9fePEFryibC3vTuMK5QI7vUKLnGxmS2uL uKSxSBHObqIWQFDkp9znLx2h61LzkSc= X-Google-Smtp-Source: AGs4zMbB/JJ/d/BfJzJzH+TaM9Z9MUym6He4qbnnpzLD3AXdSzsx0qyMj6IMwFutYWqh7kqecSkHew== X-Received: by 10.223.156.138 with SMTP id d10mr474791wre.214.1510323717398; Fri, 10 Nov 2017 06:21:57 -0800 (PST) Received: from localhost.localdomain ([160.167.170.128]) by smtp.gmail.com with ESMTPSA id e131sm1036477wmg.15.2017.11.10.06.21.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 06:21:56 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, daniel.thompson@linaro.org Cc: masami.hiramatsu@linaro.org, methavanitpong.pipat@socionext.com, masahisa.kojima@linaro.org, Ard Biesheuvel Date: Fri, 10 Nov 2017 14:20:56 +0000 Message-Id: <20171110142127.12018-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171110142127.12018-1-ard.biesheuvel@linaro.org> References: <20171110142127.12018-1-ard.biesheuvel@linaro.org> Subject: [PATCH edk2-platforms v4 03/34] Silicon/Socionext: add PlatformPeilib implementation for SynQuacer 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: , X-List-Received-Date: Fri, 10 Nov 2017 14:17:56 -0000 Create a specialized PlatformPeiLib implementation that invokes the platform specific firmware interface (currently, just a data structure left in SRAM) to set the ARM standard PcdSystemMemoryBase|Size PCDs, and expose the information via a newly added DramInfo PPI. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- v4: remove code to copy the compressed FV to DRAM, this is no longer necessary now that we have figured out how to map the NOR flash cacheable Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h | 30 +++++ Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h | 64 ++++++++++ Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c | 123 ++++++++++++++++++++ Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf | 50 ++++++++ Silicon/Socionext/SynQuacer/SynQuacer.dec | 9 ++ 5 files changed, 276 insertions(+) diff --git a/Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h b/Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h new file mode 100644 index 000000000000..f7691bdade4a --- /dev/null +++ b/Silicon/Socionext/SynQuacer/Include/Platform/DramInfo.h @@ -0,0 +1,30 @@ +/** @file + Data structure for passing DRAM information from lower level firmware + + Copyright (c) 2017, Linaro Ltd. 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. + +**/ + +#ifndef _SYNQUACER_PLATFORM_DRAM_INFO_H_ +#define _SYNQUACER_PLATFORM_DRAM_INFO_H_ + +typedef struct { + UINT64 Base; + UINT64 Size; +} DRAM_INFO_ENTRY; + +typedef struct { + UINT32 NumRegions; + UINT32 Reserved; + DRAM_INFO_ENTRY Entry[3]; +} DRAM_INFO; + +#endif diff --git a/Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h b/Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h new file mode 100644 index 000000000000..6453e121317d --- /dev/null +++ b/Silicon/Socionext/SynQuacer/Include/Ppi/DramInfo.h @@ -0,0 +1,64 @@ +/** @file + DRAM info PPI to retrieve DRAM information from lower level firmware + + Copyright (c) 2017, Linaro Ltd. 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. + +**/ + +#ifndef _SYNQUACER_DRAMINFO_PPI_ +#define _SYNQUACER_DRAMINFO_PPI_ + +#define SYNQUACER_DRAMINFO_PPI_GUID \ + { 0x3e1d7356, 0xdda4, 0x4b1a, { 0x93, 0x46, 0xbf, 0x89, 0x1c, 0x86, 0x46, 0xcc } } + +/** + Retrieve the number of discontiguous DRAM regions + + @param[out] RegionCount The number of available DRAM regions + + @retval EFI_SUCCESS The data was successfully returned. + @retval EFI_INVALID_PARAMETER RegionCount == NULL + +**/ +typedef +EFI_STATUS +(EFIAPI * DRAMINFO_GET_REGION_COUNT) ( + OUT UINTN *RegionCount + ); + +/** + Retrieve the base and size of a DRAM region + + @param[in] RegionIndex The 0-based index of the region to retrieve + @param[out] Base The base of the requested region + @param[out] Size The size of the requested region + + @retval EFI_SUCCESS The data was successfully returned. + @retval EFI_INVALID_PARAMETER Base == NULL or Size == NULL + @retval EFI_NOT_FOUND No region exists with index >= RegionIndex + +**/ +typedef +EFI_STATUS +(EFIAPI * DRAMINFO_GET_REGION) ( + IN UINTN RegionIndex, + OUT UINT64 *Base, + OUT UINT64 *Size + ); + +typedef struct { + DRAMINFO_GET_REGION_COUNT GetRegionCount; + DRAMINFO_GET_REGION GetRegion; +} SYNQUACER_DRAM_INFO_PPI; + +extern EFI_GUID gSynQuacerDramInfoPpiGuid; + +#endif diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c new file mode 100644 index 000000000000..358dd5a91f08 --- /dev/null +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.c @@ -0,0 +1,123 @@ +/** @file +* +* Copyright (c) 2011-2014, ARM 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +STATIC +CONST DRAM_INFO *mDramInfo = (VOID *)(UINTN)FixedPcdGet64 (PcdDramInfoBase); + +/** + Retrieve the number of discontiguous DRAM regions + + @param[out] RegionCount The number of available DRAM regions + + @retval EFI_SUCCESS The data was successfully returned. + @retval EFI_INVALID_PARAMETER RegionCount == NULL + +**/ +STATIC +EFI_STATUS +EFIAPI +GetDramRegionCount ( + OUT UINTN *RegionCount + ) +{ + if (RegionCount == NULL) { + return EFI_INVALID_PARAMETER; + } + + *RegionCount = mDramInfo->NumRegions; + + return EFI_SUCCESS; +} + +/** + Retrieve the base and size of a DRAM region + + @param[in] RegionIndex The 0-based index of the region to retrieve + @param[out] Base The base of the requested region + @param[out] Size The size of the requested region + + @retval EFI_SUCCESS The data was successfully returned. + @retval EFI_INVALID_PARAMETER Base == NULL or Size == NULL + @retval EFI_NOT_FOUND No region exists with index >= RegionIndex + +**/ +STATIC +EFI_STATUS +EFIAPI +GetDramRegion ( + IN UINTN RegionIndex, + OUT UINT64 *Base, + OUT UINT64 *Size + ) +{ + if (Base == NULL || Size == NULL) { + return EFI_INVALID_PARAMETER; + } + + if (RegionIndex >= mDramInfo->NumRegions) { + return EFI_NOT_FOUND; + } + + *Base = mDramInfo->Entry[RegionIndex].Base; + *Size = mDramInfo->Entry[RegionIndex].Size; + + return EFI_SUCCESS; +} + +STATIC SYNQUACER_DRAM_INFO_PPI mDramInfoPpi = { + GetDramRegionCount, + GetDramRegion +}; + +STATIC CONST EFI_PEI_PPI_DESCRIPTOR mDramInfoPpiDescriptor = { + EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, + &gSynQuacerDramInfoPpiGuid, + &mDramInfoPpi +}; + +EFI_STATUS +EFIAPI +PlatformPeim ( + VOID + ) +{ + EFI_STATUS Status; + + ASSERT (mDramInfo->NumRegions > 0); + + // + // Record the first region into PcdSystemMemoryBase and PcdSystemMemorySize. + // This is the region we will use for UEFI itself. + // + Status = PcdSet64S (PcdSystemMemoryBase, mDramInfo->Entry[0].Base); + ASSERT_EFI_ERROR (Status); + + Status = PcdSet64S (PcdSystemMemorySize, mDramInfo->Entry[0].Size); + ASSERT_EFI_ERROR (Status); + + BuildFvHob (FixedPcdGet64 (PcdFvBaseAddress), FixedPcdGet32 (PcdFvSize)); + + return PeiServicesInstallPpi (&mDramInfoPpiDescriptor); +} diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf new file mode 100644 index 000000000000..70eb715d44e3 --- /dev/null +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformPeiLib/SynQuacerPlatformPeiLib.inf @@ -0,0 +1,50 @@ +#/** @file +# +# Copyright (c) 2017, Linaro, Ltd. 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 = 0x0001001A + BASE_NAME = SynQuacerPlatformPeiLib + FILE_GUID = 86537337-b62b-4dcd-846f-033a6a8355e0 + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = PlatformPeiLib + +[Sources] + SynQuacerPlatformPeiLib.c + +[Packages] + ArmPkg/ArmPkg.dec + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + Silicon/Socionext/SynQuacer/SynQuacer.dec + +[LibraryClasses] + BaseMemoryLib + DebugLib + HobLib + MemoryAllocationLib + PcdLib + PeiServicesLib + +[FixedPcd] + gArmTokenSpaceGuid.PcdFvBaseAddress + gArmTokenSpaceGuid.PcdFvSize + gSynQuacerTokenSpaceGuid.PcdDramInfoBase + +[Ppis] + gSynQuacerDramInfoPpiGuid ## PRODUCES + +[Pcd] + gArmTokenSpaceGuid.PcdSystemMemoryBase + gArmTokenSpaceGuid.PcdSystemMemorySize diff --git a/Silicon/Socionext/SynQuacer/SynQuacer.dec b/Silicon/Socionext/SynQuacer/SynQuacer.dec index c3adf85d3562..1249ce688600 100644 --- a/Silicon/Socionext/SynQuacer/SynQuacer.dec +++ b/Silicon/Socionext/SynQuacer/SynQuacer.dec @@ -18,3 +18,12 @@ [Defines] [Includes] Include + +[Guids] + gSynQuacerTokenSpaceGuid = { 0x4d04555b, 0xdfdc, 0x418a, { 0x8a, 0xab, 0x07, 0xce, 0xef, 0x46, 0x82, 0xbb } } + +[Ppis] + gSynQuacerDramInfoPpiGuid = { 0x3e1d7356, 0xdda4, 0x4b1a, { 0x93, 0x46, 0xbf, 0x89, 0x1c, 0x86, 0x46, 0xcc } } + +[PcdsFixedAtBuild] + gSynQuacerTokenSpaceGuid.PcdDramInfoBase|0|UINT64|0x00000001 -- 2.11.0