From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it0-x233.google.com (mail-it0-x233.google.com [IPv6:2607:f8b0:4001:c0b::233]) (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 D45DC21A00AC9 for ; Tue, 4 Jul 2017 04:33:57 -0700 (PDT) Received: by mail-it0-x233.google.com with SMTP id k192so70169021ith.1 for ; Tue, 04 Jul 2017 04:35:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=MWJd19lJ20aqixDNNlt8SjiLa0fByuHFQ0QzewZspqs=; b=SVPRMmt4DcmZ8lH3bHhKyj5UoWum42aqrF4i0KxTmLTh1qNsO2USnwzXBMBHiIh+Mk JB2AX/fxjgbZjV7y3Vcyl56DzC4jBSR35VldJiT5r2dqQMwbl1ESH4kNJOpEgYugIor7 p7UF2l6odhVWPlLGjvYk8gFtnRFUgvMhAY/kE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=MWJd19lJ20aqixDNNlt8SjiLa0fByuHFQ0QzewZspqs=; b=k4A2dIy4Qy0iv155GPxPiAaP6q0OL4xqRT4xDa5/8rHCSIBAp0rab7aYfohC5x+6d4 rcQFL3fgl3rt+FaD1NHuSRsgdJYA6be3/2iJCoTNJJP/QcVlqsRyw87YgMDG6zfSkMZk AK6PTwFkm+0nEMUkWqdpATe64I2rCmZXfzP5vDo1NmRhvocPmXiF2V30KGPIa8ON7XY1 7peja6zUSZOyNSP/jg55Wi4Q76QRQCTuIItJ4jUASPSxIdGNHMaaeFZa0xeJXhiElcyV qikH203VwVJmoodefIp+pJf18plJq2pLo91ywnxCnmjAVVbxN+VRh+awf3ADPzgZ17PQ vE4w== X-Gm-Message-State: AKS2vOzz2i+CL8zx/FE+c0clSYEiuEWd2HR0HJ0MAUoRhtxBZEUMf8tk 2BGNwB8Ma6OiwUPtBp7dDH3Kl+lsfySequyHrA== X-Received: by 10.36.4.4 with SMTP id 4mr37576922itb.73.1499168135375; Tue, 04 Jul 2017 04:35:35 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.134.134 with HTTP; Tue, 4 Jul 2017 04:35:34 -0700 (PDT) In-Reply-To: <20170704112911.24114-1-leif.lindholm@linaro.org> References: <20170704112911.24114-1-leif.lindholm@linaro.org> From: Ard Biesheuvel Date: Tue, 4 Jul 2017 12:35:34 +0100 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" , Ryan Harkin Subject: Re: [PATCH] ArmPlatformPkg: convert VExpress ResetSystemLib to 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: , X-List-Received-Date: Tue, 04 Jul 2017 11:33:58 -0000 Content-Type: text/plain; charset="UTF-8" On 4 July 2017 at 12:29, Leif Lindholm wrote: > Since we're in the process of migrating all of the VExpress platforms > to MdeModulePkg ResetSystemRuntimeDxe, convert VExpress ResetSystemLib > from EfiResetSystemLib interface to the ResetSystemLib one. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Leif Lindholm > --- > .../Library/ResetSystemLib/ResetSystemLib.c | 118 ++++++++++++--------- > .../Library/ResetSystemLib/ResetSystemLib.inf | 4 +- > 2 files changed, 72 insertions(+), 50 deletions(-) > > diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c > index bafb6f8093..45bb0ab848 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c > +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c > @@ -5,6 +5,7 @@ > > Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
> Copyright (c) 2013, ARM Ltd. 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,73 +17,92 @@ > > **/ > > -#include > +#include > > -#include > #include > -#include > -#include > - > -#include Don't we need some of these for the definitions of ArmPlatformSysConfigSet and SYS_CFG_REBOOT? > +#include > > /** > - Resets the entire platform. > + 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. > > - @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. > + If this function returns, it means that the system does not support cold > + reset. > +**/ > +VOID > +EFIAPI > +ResetCold ( > + VOID > + ) > +{ > + ArmPlatformSysConfigSet (SYS_CFG_REBOOT, 0); > +} > > +/** > + 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. > **/ > -EFI_STATUS > +VOID > EFIAPI > -LibResetSystem ( > - IN EFI_RESET_TYPE ResetType, > - IN EFI_STATUS ResetStatus, > - IN UINTN DataSize, > - IN CHAR16 *ResetData OPTIONAL > +ResetWarm ( > + VOID > ) > { > - switch (ResetType) { > - case EfiResetPlatformSpecific: > - // Map the platform specific reset as reboot > - case EfiResetWarm: > - // Map a warm reset into a cold reset > - case EfiResetCold: > - // Send the REBOOT function to the platform microcontroller > - ArmPlatformSysConfigSet (SYS_CFG_REBOOT, 0); > - > - // We should never be here > - while(1); > - case EfiResetShutdown: > - // Send the SHUTDOWN function to the platform microcontroller > - ArmPlatformSysConfigSet (SYS_CFG_SHUTDOWN, 0); > - > - // We should never be here > - while(1); > - } > - > - ASSERT(FALSE); > - return EFI_UNSUPPORTED; > + ResetCold (); > } > > /** > - Initialize any infrastructure required for LibResetSystem () to function. > + This function causes the system to enter a power state equivalent > + to the ACPI G2/S5 or G3 states. > > - @param ImageHandle The firmware allocated handle for the EFI image. > - @param SystemTable A pointer to the EFI System Table. > + If this function returns, it means that the system does not support shut down reset. > +**/ > +VOID > +EFIAPI > +ResetShutdown ( > + VOID > + ) > +{ > + ArmPlatformSysConfigSet (SYS_CFG_SHUTDOWN, 0); > +} > > - @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. > +**/ > +VOID > +EFIAPI > +EnterS3WithImmediateWake ( > + VOID > + ) > +{ > + // 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. > **/ > -EFI_STATUS > +VOID > EFIAPI > -LibInitializeResetSystem ( > - IN EFI_HANDLE ImageHandle, > - IN EFI_SYSTEM_TABLE *SystemTable > +ResetPlatformSpecific ( > + IN UINTN DataSize, > + IN VOID *ResetData > ) > { > - return EFI_SUCCESS; > + ResetCold (); > } > diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf > index 8c17ea8cdb..bb87df50ef 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf > +++ b/ArmPlatformPkg/ArmVExpressPkg/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,12 +20,13 @@ > FILE_GUID = 36885202-0854-4373-bfd2-95d229b44d44 > MODULE_TYPE = BASE > VERSION_STRING = 1.0 > - LIBRARY_CLASS = EfiResetSystemLib > + LIBRARY_CLASS = ResetSystemLib > > [Sources.common] > ResetSystemLib.c > > [Packages] > + MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > EmbeddedPkg/EmbeddedPkg.dec Do we still need this? > ArmPlatformPkg/ArmPlatformPkg.dec ... and this, given my question above?