From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4864:20::543; helo=mail-ed1-x543.google.com; envelope-from=pete@akeo.ie; receiver=edk2-devel@lists.01.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) (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 23D75211AE8A9 for ; Tue, 29 Jan 2019 08:27:20 -0800 (PST) Received: by mail-ed1-x543.google.com with SMTP id x30so16503031edx.2 for ; Tue, 29 Jan 2019 08:27:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fxmJHG1M5WguPHsyFXO4Zrn5nxK7BIyL0BG6XJjFSD8=; b=IK08r+GR3NO1384OhgZgAxVN1HZsd4IesuZxMnksqf/25Lde1kAMjroS+/UWCSRmGe B0rFvgHU5nj06tXYB9TEahxErEYb5kvHohwvNk6ztzJY3e5hUcq2C2Ylxg2zmaxHmmT9 1EKfsxLjjfR03BJxnp1CVm8vh8shkJVcyqP55J8SQDoMGVfLPeR+WiiO8qtkA4GGqSFZ a0SGWjS3PcUH8QGX4+Yk003wNooSZuDnx4LowkYXaEEjqAjjYyT812x7ouCXsmQ23s/r Ps/N10J6ccDAXq59f4CatZFrvvmj227tWBb6gYwXk6ICU1HDwnSQ1Mh+E/ajZOhoyaKQ RfOg== 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=fxmJHG1M5WguPHsyFXO4Zrn5nxK7BIyL0BG6XJjFSD8=; b=jq13EBdy1DMEh7jaUyMnp9i37CXxJJ1xIFmYdCO24r0XAHccUwrhOGMLrPFSxBBfR/ fO7kjexMC/jYhww1O6SOmXMwczTNPAklXF3Ew/bmC/jMENDMBRZLVfks8dqDT7Uu2iCG fMMk6gphVpeN8kkfUh4I+LukGYJ9vlwCqZATVSiRsSOb1DBQK6QGMAkyYXrdbWNNR8As kqBXjhQvTIekzwHqgXveCw245wUXTYbL0mZqJTotwLdFp9OJlF1eXzTkz+s22jrcfsjY U5Z8FtAMzxSf0fEIJSJ6dHqUnBRdfy6W9RtsS6Q40ZjM7tjIUs3M8IhR5g12gbiHv0kC aG5A== X-Gm-Message-State: AJcUukcxu5yw4AgaU2VfdQ8lBDgeGtIZDsY9STWXTZpjmzQzkGBJC5Dl jVjdaQeCliVYkq7/UpqBJdScuZrxzaQ= X-Google-Smtp-Source: ALg8bN4UW2Yw3MnZfKeMA4l425JVZkf0zBJ3/2o70wdP8BpT3CARtz8J1Mtm6i9L10fEyiBCRap83Q== X-Received: by 2002:a17:906:258d:: with SMTP id m13mr9232905ejb.73.1548779238155; Tue, 29 Jan 2019 08:27:18 -0800 (PST) Received: from localhost.localdomain ([84.203.95.186]) by smtp.gmail.com with ESMTPSA id p16-v6sm8303056eju.73.2019.01.29.08.27.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 08:27:17 -0800 (PST) From: Pete Batard To: edk2-devel@lists.01.org Date: Tue, 29 Jan 2019 16:26:36 +0000 Message-Id: <20190129162655.3800-5-pete@akeo.ie> X-Mailer: git-send-email 2.17.0.windows.1 In-Reply-To: <20190129162655.3800-1-pete@akeo.ie> References: <20190129162655.3800-1-pete@akeo.ie> Subject: [PATCH v4 edk2-platforms 04/23] Platform/Raspberry/Pi3: Add reset and memory init libraries 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: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 X-List-Received-Date: Tue, 29 Jan 2019 16:27:20 -0000 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Pete Batard --- Platform/Raspberry/Pi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c | 162 ++++++++++++++++++++ Platform/Raspberry/Pi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf | 51 ++++++ Platform/Raspberry/Pi3/Library/ResetLib/ResetLib.c | 104 +++++++++++++ Platform/Raspberry/Pi3/Library/ResetLib/ResetLib.inf | 46 ++++++ 4 files changed, 363 insertions(+) diff --git a/Platform/Raspberry/Pi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c b/Platform/Raspberry/Pi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c new file mode 100644 index 000000000000..903364e08b15 --- /dev/null +++ b/Platform/Raspberry/Pi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c @@ -0,0 +1,162 @@ +/** @file + * + * Copyright (c) 2017-2018, Andrey Warkentin + * Copyright (c) 2011-2015, 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 + +extern UINT64 mSystemMemoryEnd; + +VOID +BuildMemoryTypeInformationHob ( + VOID + ); + +STATIC +VOID +InitMmu ( + IN ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable + ) +{ + RETURN_STATUS Status; + + //Note: Because we called PeiServicesInstallPeiMemory() before to call InitMmu() the MMU Page Table + // resides in DRAM (even at the top of DRAM as it is the first permanent memory allocation) + Status = ArmConfigureMmu (MemoryTable, NULL, NULL); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Error: Failed to enable MMU\n")); + } +} + +STATIC +VOID +AddRuntimeServicesRegion ( + IN ARM_MEMORY_REGION_DESCRIPTOR *Desc +) +{ + BuildResourceDescriptorHob ( + EFI_RESOURCE_SYSTEM_MEMORY, + EFI_RESOURCE_ATTRIBUTE_PRESENT | + EFI_RESOURCE_ATTRIBUTE_INITIALIZED | + EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE | + EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE | + EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE | + EFI_RESOURCE_ATTRIBUTE_TESTED, + Desc->PhysicalBase, + Desc->Length + ); + + BuildMemoryAllocationHob ( + Desc->PhysicalBase, + Desc->Length, + EfiRuntimeServicesData + ); +} + +STATIC +VOID +AddReservedMemoryRegion ( + IN ARM_MEMORY_REGION_DESCRIPTOR *Desc + ) +{ + BuildResourceDescriptorHob ( + EFI_RESOURCE_SYSTEM_MEMORY, + EFI_RESOURCE_ATTRIBUTE_PRESENT | + EFI_RESOURCE_ATTRIBUTE_INITIALIZED | + EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE | + EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE | + EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE | + EFI_RESOURCE_ATTRIBUTE_TESTED, + Desc->PhysicalBase, + Desc->Length + ); + + BuildMemoryAllocationHob ( + Desc->PhysicalBase, + Desc->Length, + EfiReservedMemoryType + ); +} + +/*++ + +Routine Description: + + + +Arguments: + + FileHandle - Handle of the file being invoked. + PeiServices - Describes the list of possible PEI Services. + +Returns: + + Status - EFI_SUCCESS if the boot mode could be set + +--*/ +EFI_STATUS +EFIAPI +MemoryPeim ( + IN EFI_PHYSICAL_ADDRESS UefiMemoryBase, + IN UINT64 UefiMemorySize + ) +{ + ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable; + + // Get Virtual Memory Map from the Platform Library + ArmPlatformGetVirtualMemoryMap (&MemoryTable); + + // Ensure PcdSystemMemorySize has been set + ASSERT (PcdGet64 (PcdSystemMemorySize) != 0); + + // FD without variable store + AddReservedMemoryRegion (&MemoryTable[0]); + + // Variable store. + AddRuntimeServicesRegion (&MemoryTable[1]); + + // Trusted Firmware region + AddReservedMemoryRegion (&MemoryTable[2]); + + // Usable memory. + BuildResourceDescriptorHob ( + EFI_RESOURCE_SYSTEM_MEMORY, + EFI_RESOURCE_ATTRIBUTE_PRESENT | + EFI_RESOURCE_ATTRIBUTE_INITIALIZED | + EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE | + EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE | + EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE | + EFI_RESOURCE_ATTRIBUTE_TESTED, + MemoryTable[3].PhysicalBase, + MemoryTable[3].Length + ); + + AddReservedMemoryRegion (&MemoryTable[4]); + + // Build Memory Allocation Hob + InitMmu (MemoryTable); + + if (FeaturePcdGet (PcdPrePiProduceMemoryTypeInformationHob)) { + // Optional feature that helps prevent EFI memory map fragmentation. + BuildMemoryTypeInformationHob (); + } + + return EFI_SUCCESS; +} diff --git a/Platform/Raspberry/Pi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf b/Platform/Raspberry/Pi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf new file mode 100644 index 000000000000..8e44f2e39408 --- /dev/null +++ b/Platform/Raspberry/Pi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf @@ -0,0 +1,51 @@ +#/** @file +# +# Copyright (c) 2016, Linaro, Ltd. All rights reserved. +# Copyright (c) 2011-2014, ARM 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 = MemoryInitPeiLib + FILE_GUID = 4bbc9c10-a100-43fb-8311-332ba497d1b4 + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = MemoryInitPeiLib|SEC PEIM + +[Sources] + MemoryInitPeiLib.c + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + EmbeddedPkg/EmbeddedPkg.dec + ArmPkg/ArmPkg.dec + ArmPlatformPkg/ArmPlatformPkg.dec + +[LibraryClasses] + DebugLib + HobLib + ArmMmuLib + ArmPlatformLib + +[Guids] + gEfiMemoryTypeInformationGuid + +[FeaturePcd] + gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob + +[FixedPcd] + gArmTokenSpaceGuid.PcdSystemMemoryBase + gArmTokenSpaceGuid.PcdSystemMemorySize + +[Depex] + TRUE diff --git a/Platform/Raspberry/Pi3/Library/ResetLib/ResetLib.c b/Platform/Raspberry/Pi3/Library/ResetLib/ResetLib.c new file mode 100644 index 000000000000..465bb8babf25 --- /dev/null +++ b/Platform/Raspberry/Pi3/Library/ResetLib/ResetLib.c @@ -0,0 +1,104 @@ +/** @file + * + * Support ResetSystem Runtime call using PSCI calls. + * Signals the gRaspberryPiEventResetGuid event group on reset. + * + * Copyright (c) 2018, Andrei Warkentin + * Copyright (c) 2014, Linaro Ltd. All rights reserved. + * Copyright (c) 2013-2015, ARM Ltd. All rights reserved. + * 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 +#include +#include + +#include + +/** + Resets the entire platform. + + @param ResetType The type of reset to perform. + @param ResetStatus The status code for the reset. + @param DataSize The size, in bytes, of WatchdogData. + @param ResetData For a ResetType of EfiResetCold, EfiResetWarm, or + EfiResetShutdown the data buffer starts with a Null-terminated + Unicode string, optionally followed by additional binary data. + +**/ +EFI_STATUS +EFIAPI +LibResetSystem ( + IN EFI_RESET_TYPE ResetType, + IN EFI_STATUS ResetStatus, + IN UINTN DataSize, + IN CHAR16 *ResetData OPTIONAL + ) +{ + ARM_SMC_ARGS ArmSmcArgs; + + if (!EfiAtRuntime ()) { + /* + * Only if still in UEFI. + */ + EfiEventGroupSignal (&gRaspberryPiEventResetGuid); + } + + switch (ResetType) { + case EfiResetPlatformSpecific: + // Map the platform specific reset as reboot + case EfiResetWarm: + // Map a warm reset into a cold reset + case EfiResetCold: + // Send a PSCI 0.2 SYSTEM_RESET command + ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET; + break; + case EfiResetShutdown: + // Send a PSCI 0.2 SYSTEM_OFF command + ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF; + break; + default: + ASSERT (FALSE); + return EFI_UNSUPPORTED; + } + + ArmCallSmc (&ArmSmcArgs); + + // We should never be here + DEBUG ((DEBUG_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__)); + CpuDeadLoop (); + return EFI_UNSUPPORTED; +} + +/** + Initialize any infrastructure required for LibResetSystem () to function. + + @param ImageHandle The firmware allocated handle for the EFI image. + @param SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS. + +**/ +EFI_STATUS +EFIAPI +LibInitializeResetSystem ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + return EFI_SUCCESS; +} diff --git a/Platform/Raspberry/Pi3/Library/ResetLib/ResetLib.inf b/Platform/Raspberry/Pi3/Library/ResetLib/ResetLib.inf new file mode 100644 index 000000000000..6a5af8a8e191 --- /dev/null +++ b/Platform/Raspberry/Pi3/Library/ResetLib/ResetLib.inf @@ -0,0 +1,46 @@ +#/** @file +# +# Reset System lib using PSCI hypervisor or secure monitor calls. +# Signals the gRaspberryPiEventResetGuid event group on reset. +# +# Copyright (c) 2018, Andrei Warkentin +# Copyright (c) 2014, Linaro Ltd. All rights reserved. +# Copyright (c) 2014, ARM Ltd. All rights reserved. +# Copyright (c) 2008, 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. +# +#**/ + +[Defines] + INF_VERSION = 0x0001001A + BASE_NAME = ResetLib + FILE_GUID = B9F59B69-A105-41C7-8F5A-2C60DD7FD7AB + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = EfiResetSystemLib + +[Sources] + ResetLib.c + +[Packages] + ArmPkg/ArmPkg.dec + MdePkg/MdePkg.dec + EmbeddedPkg/EmbeddedPkg.dec + Platform/Raspberry/Pi3/RPi3.dec + +[LibraryClasses] + DebugLib + BaseLib + ArmSmcLib + UefiLib + UefiRuntimeLib + +[Guids] + gRaspberryPiEventResetGuid -- 2.17.0.windows.1