From nobody Mon Feb 9 01:34:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+54783+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+54783+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582627511; cv=none; d=zohomail.com; s=zohoarc; b=Qc4qXikCyI7msiRR6T8FAqQuxetY53SoK3w0WGrXkIcdQd5AhMwU7ixeV0GqvTyTurnEWTfPX1RxKDAh+DMSjDZiT3wxN+RrJuIGm3OeSKWfke05M9L76vTYvpbboen2tMcvKNreaK/roEKS8r6SXtoZ8kKXTRKrzUepl7uiewQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582627511; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=+UViZ0VmNkfFIqEbeX12iRqwIV271JqyhE3COQcde1g=; b=ZHOS9pCw6J9bi6oMSBqKDTlYIv5kpDgI7FM5TfSccVEZhxTHRAiSPxYo78gXPQnv44KEeOyVXeqBqP3MBkibpvbviAC4fTGxIhlEQb9UzRrjQAYepJ61IkvbBPalwPkkMhAJqluZqTgwUcWKaa/EWl1HzC87OUVA3KaFLgbMcm0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+54783+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1582627511681479.87878991789444; Tue, 25 Feb 2020 02:45:11 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id mf97YY1788612xKKiisttatB; Tue, 25 Feb 2020 02:45:10 -0800 X-Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.groups.io with SMTP id smtpd.web11.2256.1582627509937133881 for ; Tue, 25 Feb 2020 02:45:10 -0800 X-Received: by mail-wm1-f68.google.com with SMTP id a6so2625551wme.2 for ; Tue, 25 Feb 2020 02:45:09 -0800 (PST) X-Gm-Message-State: VsR7SxBVj378J4kVlpAk4Y96x1787277AA= X-Google-Smtp-Source: APXvYqxKb6NJiqc/3NFpURthF7X5/zLySX1vbfIAKdhiurpeLaaCKhFWjI9VEDz5GUPVPiZ+WJN0rw== X-Received: by 2002:a1c:de55:: with SMTP id v82mr4568303wmg.48.1582627508093; Tue, 25 Feb 2020 02:45:08 -0800 (PST) X-Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id g14sm13218913wrv.58.2020.02.25.02.45.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 02:45:07 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, eric.auger@redhat.com, philmd@redhat.com, marcandre.lureau@redhat.com, stefanb@linux.ibm.com, leif@nuviainc.com Subject: [edk2-devel] [PATCH v2 4/5] ArmVirtPkg: implement ArmVirtPsciResetSystemPeiLib Date: Tue, 25 Feb 2020 11:44:48 +0100 Message-Id: <20200225104449.22453-5-ard.biesheuvel@linaro.org> In-Reply-To: <20200225104449.22453-1-ard.biesheuvel@linaro.org> References: <20200225104449.22453-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1582627510; bh=b0GFQ2dwJWjdIJDFTkzUJEOOWtLv4Ib4qFj863ZdMno=; h=Cc:Date:From:Reply-To:Subject:To; b=Uj4u8cuq+CgocPFb6oPthf9qd5JDObILUaOzV11EO0loRuzPLYKiGF2OVmRrt6yPtsz mfT10abI5QUQ6NRkZfT4b8joRzOIlN1GqbCveKvnNgO5U481RvRifgPwy1PBIqk7m2Ns2 fz70m2flGUQU0uLtzO1q9KygUYnITg3Uad8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Implement a ArmVirtPkg specific version of the PSCI ResetSystemLib that is usable in the PEI phase, as the existing one relies on the FDT client protocol, making it unsuitable. Note that accessing the device tree passed by QEMU via its initial base address is guaranteed to be safe at any time during the PEI phase, so we can defer discovery of the PSCI method until the time the reset library is actually invoked (which is rarely) Signed-off-by: Ard Biesheuvel Acked-by: Laszlo Ersek --- ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiL= ib.c | 232 ++++++++++++++++++++ ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiL= ib.inf | 39 ++++ 2 files changed, 271 insertions(+) diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciRes= etSystemPeiLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtP= sciResetSystemPeiLib.c new file mode 100644 index 000000000000..394a04e3c384 --- /dev/null +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSyste= mPeiLib.c @@ -0,0 +1,232 @@ +/** @file + Reset System lib using PSCI hypervisor or secure monitor calls + + Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
+ Copyright (c) 2013, ARM Ltd. All rights reserved.
+ Copyright (c) 2014-2020, Linaro Ltd. All rights reserved.
+ Copyright (c) 2019, Intel Corporation. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +typedef enum { + PsciMethodUnknown, + PsciMethodSmc, + PsciMethodHvc, +} PSCI_METHOD; + +STATIC +PSCI_METHOD +DiscoverPsciMethod ( + VOID + ) +{ + VOID *DeviceTreeBase; + INT32 Node, Prev; + INT32 Len; + CONST CHAR8 *Compatible; + CONST CHAR8 *CompatibleItem; + CONST VOID *Prop; + + DeviceTreeBase =3D (VOID*)(UINTN)PcdGet64 (PcdDeviceTreeInitialBaseAddre= ss); + ASSERT (fdt_check_header (DeviceTreeBase) =3D=3D 0); + + // + // Enumerate all FDT nodes looking for the PSCI node and capture the met= hod + // + for (Prev =3D 0;; Prev =3D Node) { + Node =3D fdt_next_node (DeviceTreeBase, Prev, NULL); + if (Node < 0) { + break; + } + + Compatible =3D fdt_getprop (DeviceTreeBase, Node, "compatible", &Len); + if (Compatible =3D=3D NULL) { + continue; + } + + // + // Iterate over the NULL-separated items in the compatible string + // + for (CompatibleItem =3D Compatible; CompatibleItem < Compatible + Len; + CompatibleItem +=3D 1 + AsciiStrLen (CompatibleItem)) { + + if (AsciiStrCmp (CompatibleItem, "arm,psci-0.2") !=3D 0) { + continue; + } + + Prop =3D fdt_getprop (DeviceTreeBase, Node, "method", NULL); + if (!Prop) { + DEBUG ((DEBUG_ERROR, "%a: Missing PSCI method property\n", + __FUNCTION__)); + return PsciMethodUnknown; + } + + if (AsciiStrnCmp (Prop, "hvc", 3) =3D=3D 0) { + return PsciMethodHvc; + } else if (AsciiStrnCmp (Prop, "smc", 3) =3D=3D 0) { + return PsciMethodSmc; + } else { + DEBUG ((DEBUG_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTIO= N__, + Prop)); + return PsciMethodUnknown; + } + } + } + return PsciMethodUnknown; +} + +STATIC +VOID +PerformPsciAction ( + IN UINTN Arg0 + ) +{ + ARM_SMC_ARGS ArmSmcArgs; + ARM_HVC_ARGS ArmHvcArgs; + + ArmSmcArgs.Arg0 =3D Arg0; + ArmHvcArgs.Arg0 =3D Arg0; + + switch (DiscoverPsciMethod ()) { + case PsciMethodHvc: + ArmCallHvc (&ArmHvcArgs); + break; + + case PsciMethodSmc: + ArmCallSmc (&ArmSmcArgs); + break; + + default: + DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__)); + ASSERT (FALSE); + } +} + +/** + 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 +EFIAPI +ResetCold ( + VOID + ) +{ + // Send a PSCI 0.2 SYSTEM_RESET command + PerformPsciAction (ARM_SMC_ID_PSCI_SYSTEM_RESET); +} + +/** + 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 +ResetWarm ( + VOID + ) +{ + // Map a warm reset into a cold reset + ResetCold (); +} + +/** + 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. +**/ +VOID +EFIAPI +ResetShutdown ( + VOID + ) +{ + // Send a PSCI 0.2 SYSTEM_OFF command + PerformPsciAction (ARM_SMC_ID_PSCI_SYSTEM_OFF); +} + +/** + 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 Reset= Data + 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 str= ing, + followed by the EFI_GUID. +**/ +VOID +EFIAPI +ResetPlatformSpecific ( + IN UINTN DataSize, + IN VOID *ResetData + ) +{ + // Map the platform specific reset as reboot + ResetCold (); +} + +/** + The ResetSystem function resets the entire platform. + + @param[in] ResetType The type of reset to perform. + @param[in] ResetStatus The status code for the reset. + @param[in] DataSize The size, in bytes, of ResetData. + @param[in] ResetData For a ResetType of EfiResetCold, EfiResetWarm,= or EfiResetShutdown + the data buffer starts with a Null-terminated = string, optionally + followed by additional binary data. The string= is a description + that the caller may use to further indicate th= e reason for the + system reset. +**/ +VOID +EFIAPI +ResetSystem ( + IN EFI_RESET_TYPE ResetType, + IN EFI_STATUS ResetStatus, + IN UINTN DataSize, + IN VOID *ResetData OPTIONAL + ) +{ + switch (ResetType) { + case EfiResetWarm: + ResetWarm (); + break; + + case EfiResetCold: + ResetCold (); + break; + + case EfiResetShutdown: + ResetShutdown (); + return; + + case EfiResetPlatformSpecific: + ResetPlatformSpecific (DataSize, ResetData); + return; + + default: + return; + } +} diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciRes= etSystemPeiLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVir= tPsciResetSystemPeiLib.inf new file mode 100644 index 000000000000..3a65706e8dc6 --- /dev/null +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSyste= mPeiLib.inf @@ -0,0 +1,39 @@ +#/** @file +# Reset System lib using PSCI hypervisor or secure monitor calls +# +# Copyright (c) 2008, Apple Inc. All rights reserved.
+# Copyright (c) 2014-2020, Linaro Ltd. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# +#**/ + +[Defines] + INF_VERSION =3D 1.27 + BASE_NAME =3D ArmVirtPsciResetSystemPeiLib + FILE_GUID =3D 551cfb98-c185-41a3-86bf-8cdb7e2a530c + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D ResetSystemLib|PEIM + +[Sources] + ArmVirtPsciResetSystemPeiLib.c + +[Packages] + ArmPkg/ArmPkg.dec + ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + ArmSmcLib + ArmHvcLib + BaseLib + DebugLib + FdtLib + HobLib + +[Pcd] + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54783): https://edk2.groups.io/g/devel/message/54783 Mute This Topic: https://groups.io/mt/71530904/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-