From patchwork Mon Jul 3 16:25:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 106915 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp63616qge; Mon, 3 Jul 2017 09:27:36 -0700 (PDT) X-Received: by 10.84.224.11 with SMTP id r11mr11712873plj.267.1499099256868; Mon, 03 Jul 2017 09:27:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499099256; cv=none; d=google.com; s=arc-20160816; b=XDfjRTj+G+Yo/ZMbheo4SZg5X/A8PWerrbtb6w6ollez72G4pN8C9jioOIufKC4h8f cOdcp3SjC1RtNENbRP4dZGuO+v+spS0qIDZZW25J38nbK6Y/Tu53G1Ve26HaFuECwKyK Z+09jTcKkGeeVN6Mp9yFxFVw72CB9GxjZ1VJBJQ9Y9J9sKP8z+b6skIggJPzhXns1rJs ie+JLWx/QAHrh+WvOJmDVym4NhqGv7aiDSgDWpNb+BKgF7cAVZXKoudOVpQFsXEEIaPz HwroBl1raX4DOrXsqxJXqCEwV27vpE6NzOEmGB3ClAcO73bOF/jfj8ayJa18y2FJs2QB gkZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=mDfwLSuarjGLqFWNjiWReWyFaYsQs7riEnUsIUvPfak=; b=oBE9bTEoINW18Bgz9cm652vwRWFnWZh446oBnBMXc3aZvr+ccPlibUc1B5uTBd/gsU COkjFtPbn9OSx0g0MNJAzWOUZWlbXMwl2BflGOWgG6hIuxmRn0sH18bdpO4OjwSf2s2e ht0aYL9qlPIsStl06IUc0cQVZXSLp1/fNIXZt1mLEs4uldWoNCtxk6jwlDG3hp7Ad8Ij t2Wv4U+QZNUz3AxQk1yICgt7+Ay8s7mLp39Ks/N3piemtO5W/QW5JZ3xBDBdHQFh5y7U CAsoO7wUviTQs/nz3tAtOSO78V+UlrDzLeEN5sgAUqzt2h63xC1tBbaGsI7g6MR1uiw0 OusA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=I3/3AR3Q; 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 v17si12389163pgc.87.2017.07.03.09.27.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 09:27:36 -0700 (PDT) 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.b=I3/3AR3Q; 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 835FF21A00AC2; Mon, 3 Jul 2017 09:25:58 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::22c]) (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 A494B21A00AC2 for ; Mon, 3 Jul 2017 09:25:57 -0700 (PDT) Received: by mail-wm0-x22c.google.com with SMTP id z75so39237243wmc.0 for ; Mon, 03 Jul 2017 09:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=lhO62+k2trKTtNrrt9tNU2Xp3Olz8UGmb66si/NpkfY=; b=I3/3AR3QZwO9h1Z2aBgwTsaaarCyZa33az7E17pGwCWvU38jz6xBN9IbwC31+gcoG/ ncu5LwNIm5xxMwzOM+CuqDPIB7vXmo9Bi4h1BE3ek+EvYSFI/a7BJoMbo7oJDNCbkRqR aNOm3j77dTI+a8EYXIi7g6+1IChPhGQW5xenE= 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; bh=lhO62+k2trKTtNrrt9tNU2Xp3Olz8UGmb66si/NpkfY=; b=JX8FGXk7eMLHNIW5MXlwGgdX19ntMkSgNYL4vaJ/NrOrpGl9Ltif12dDYmlhY/5D8q KVyXB9eN3z2KBQZK808SHqHKLxEIqM7YkZOV9hwZrq4S7Diox3vY456lWYD+GS6WCXbW kRR+4bkXDbxNzahV36soHzTMA+hI9htp9/TUcW9iiGvvr74GoHR8C2X80L8HjZynrKzF E2Bh6mT9p8zckRBaLyV+qDlT1HLzdKpXhNVTFXCkPvFNjJ33sk0XKaPr85oaQgzU9Vk9 2y4KCuPTSukM3LV0CI61tIOngZiFuEKwnsacAE3mQagQJJ7nI+rETE7LFyjngl5C6E0P RETg== X-Gm-Message-State: AIVw11013pw41mP1bxLRSKt/Fncdl7oIwJyZ2y/x6FaQtwhZTLJnkcc4 HOZPmSoME054dNNFVoc23Q== X-Received: by 10.28.186.65 with SMTP id k62mr2225470wmf.34.1499099253146; Mon, 03 Jul 2017 09:27:33 -0700 (PDT) Received: from mohikan.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id t204sm7686334wme.2.2017.07.03.09.27.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 09:27:32 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Mon, 3 Jul 2017 17:25:31 +0100 Message-Id: <20170703162531.27349-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [edk2] [PATCH] BeagleBoardPkg: switch to use MdeModulePkg ResetSystemLib 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: ard.biesheuvel@linaro.org MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The BeagleBoard port used EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf for its reset handling. With the arrival MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf As part of this, change BeagleBoardPkg/Library/ResetSystemLib to be an implementation of ResetSystemLib instead of the previous EfiResetSystemLib. Wire all reset variants to ResetCold, except for ResetShutdown and EnterS3WithImmediateWake, which return immediately. Note: this ResetSystemLib never supported being called after ExitBootservices, and this shortcoming is not addressed here. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm --- This is only build tested for now. Once the edk2-platforms master branch goes live, I intend to move this platform there, and bring back in the BeagleBoard Black port. Which I do have a test platform handy for. BeagleBoardPkg/BeagleBoardPkg.dsc | 4 +- BeagleBoardPkg/BeagleBoardPkg.fdf | 2 +- .../Library/ResetSystemLib/ResetSystemLib.c | 180 ++++++++------------- .../Library/ResetSystemLib/ResetSystemLib.inf | 16 +- 4 files changed, 70 insertions(+), 132 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc index 90d6af444d..b22f814a28 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.dsc +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc @@ -56,7 +56,7 @@ BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - EfiResetSystemLib|BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf + ResetSystemLib|BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf @@ -421,7 +421,7 @@ # SerialPortLib|ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf # } - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf index f140d9019c..c9c6afd714 100644 --- a/BeagleBoardPkg/BeagleBoardPkg.fdf +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf @@ -115,7 +115,7 @@ FvNameGuid = d0dd3e90-343d-4cb3-8f69-772214989282 INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf diff --git a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c index 6b7879b02b..7bc6c6c329 100644 --- a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c +++ b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c @@ -2,6 +2,7 @@ Do a generic Cold Reset for OMAP3550 and BeagleBoard specific Warm reset Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.
+ 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 @@ -16,150 +17,95 @@ #include -#include -#include -#include #include -#include -#include -#include +#include #include +/** + This function causes a system-wide reset (cold reset), in which + all circuitry within the system returns to its initial state. This type of + reset is asynchronous to system operation and operates without regard to + cycle boundaries. + If this function returns, it means that the system does not support cold + reset. +**/ VOID -ShutdownEfi ( +EFIAPI +ResetCold ( VOID ) { - EFI_STATUS Status; - UINTN MemoryMapSize; - EFI_MEMORY_DESCRIPTOR *MemoryMap; - UINTN MapKey; - UINTN DescriptorSize; - UINTN DescriptorVersion; - UINTN Pages; - - MemoryMap = NULL; - MemoryMapSize = 0; - do { - Status = gBS->GetMemoryMap ( - &MemoryMapSize, - MemoryMap, - &MapKey, - &DescriptorSize, - &DescriptorVersion - ); - if (Status == EFI_BUFFER_TOO_SMALL) { - - Pages = EFI_SIZE_TO_PAGES (MemoryMapSize) + 1; - MemoryMap = AllocatePages (Pages); - - // - // Get System MemoryMap - // - Status = gBS->GetMemoryMap ( - &MemoryMapSize, - MemoryMap, - &MapKey, - &DescriptorSize, - &DescriptorVersion - ); - // Don't do anything between the GetMemoryMap() and ExitBootServices() - if (!EFI_ERROR (Status)) { - Status = gBS->ExitBootServices (gImageHandle, MapKey); - if (EFI_ERROR (Status)) { - FreePages (MemoryMap, Pages); - MemoryMap = NULL; - MemoryMapSize = 0; - } - } - } - } while (EFI_ERROR (Status)); - - //Clean and invalidate caches. - WriteBackInvalidateDataCache(); - InvalidateInstructionCache(); - - //Turning off Caches and MMU - ArmDisableDataCache (); - ArmDisableInstructionCache (); - ArmDisableMmu (); + //Perform cold reset of the system. + MmioOr32 (PRM_RSTCTRL, RST_DPLL3); + while ((MmioRead32(PRM_RSTST) & GLOBAL_COLD_RST) != 0x1); } -typedef +/** + This function causes a system-wide initialization (warm reset), in which all + processors are set to their initial state. Pending cycles are not corrupted. + + If this function returns, it means that the system does not support warm + reset. +**/ VOID -(EFIAPI *CALL_STUB)( +EFIAPI +ResetWarm ( VOID -); - + ) +{ + ResetCold (); +} /** - 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. + This function causes the system to enter a power state equivalent + to the ACPI G2/S5 or G3 states. + If this function returns, it means that the system does not support shut down + reset. **/ -EFI_STATUS +VOID EFIAPI -LibResetSystem ( - IN EFI_RESET_TYPE ResetType, - IN EFI_STATUS ResetStatus, - IN UINTN DataSize, - IN CHAR16 *ResetData OPTIONAL +ResetShutdown ( + VOID ) { - CALL_STUB StartOfFv; - - if (ResetData != NULL) { - DEBUG((EFI_D_ERROR, "%s", ResetData)); - } - - ShutdownEfi (); - - switch (ResetType) { - case EfiResetWarm: - //Perform warm reset of the system by jumping to the begining of the FV - StartOfFv = (CALL_STUB)(UINTN)PcdGet64 (PcdFvBaseAddress); - StartOfFv (); - break; - case EfiResetCold: - case EfiResetShutdown: - default: - //Perform cold reset of the system. - MmioOr32 (PRM_RSTCTRL, RST_DPLL3); - while ((MmioRead32(PRM_RSTST) & GLOBAL_COLD_RST) != 0x1); - break; - } - - // If the reset didn't work, return an error. - ASSERT (FALSE); - return EFI_DEVICE_ERROR; + // not implemented } - - /** - 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. + This function causes the system to enter S3 and then wake up immediately. + If this function returns, it means that the system does not support S3 + feature. **/ -EFI_STATUS +VOID EFIAPI -LibInitializeResetSystem ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable +EnterS3WithImmediateWake ( + VOID ) { - return EFI_SUCCESS; + // not implemented } +/** + This function causes a systemwide reset. The exact type of the reset is + defined by the EFI_GUID that follows the Null-terminated Unicode string passed + into ResetData. If the platform does not recognize the EFI_GUID in ResetData + the platform must pick a supported reset type to perform.The platform may + optionally log the parameters from any non-normal reset that occurs. + + @param[in] DataSize The size, in bytes, of ResetData. + @param[in] ResetData The data buffer starts with a Null-terminated string, + followed by the EFI_GUID. +**/ +VOID +EFIAPI +ResetPlatformSpecific ( + IN UINTN DataSize, + IN VOID *ResetData + ) +{ + ResetCold (); +} diff --git a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf index 64638cb62c..150c4bb900 100644 --- a/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf +++ b/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf @@ -2,6 +2,7 @@ # Reset System lib to make it easy to port new platforms # # Copyright (c) 2008, Apple Inc. All rights reserved.
+# 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 @@ -19,31 +20,22 @@ FILE_GUID = 781371a2-3fdd-41d4-96a1-7b34cbc9e895 MODULE_TYPE = BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = EfiResetSystemLib + LIBRARY_CLASS = ResetSystemLib [Sources.common] ResetSystemLib.c [Packages] - MdePkg/MdePkg.dec ArmPkg/ArmPkg.dec - EmbeddedPkg/EmbeddedPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec Omap35xxPkg/Omap35xxPkg.dec [Pcd.common] gArmTokenSpaceGuid.PcdCpuResetAddress - gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress [LibraryClasses] - DebugLib - ArmLib - CacheMaintenanceLib - MemoryAllocationLib - UefiRuntimeServicesTableLib - TimerLib - UefiLib - UefiBootServicesTableLib [Pcd] gArmTokenSpaceGuid.PcdFvBaseAddress