From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web10.601.1582743925086080924 for ; Wed, 26 Feb 2020 11:05:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=gO901OLu; spf=pass (domain: linaro.org, ip: 209.85.221.44, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f44.google.com with SMTP id j7so24909wrp.13 for ; Wed, 26 Feb 2020 11:05:24 -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=8VSo/FOFUIN2HlCM0Pc7NvFmjWeNEYKwdUKq7A2Cd8w=; b=gO901OLu1TJmchl2w1DH7sINPv+cmO0ZKMPbnws0YsNcHUfDSaMXKlk7as1EUP9K25 TF3z1x+fOht9FNXVCZyn2Zo4EVqAu6l1BvyMNcWGkswfOO9WWwWx5OiaJfCdp730mHZy HX/mt+gBljNV2xFON5gYoTdjLw3kzKrN5tpZ8fYNb5nV7s2giMqICDgIl9D/se9dLemE dKze0ZkxFtP6E8OHOwu4lxrCmMPTIFnZkHpbIE/pT3X4y4zHgQPNR9KK8aJb72i/tgWc akewiKzb2NcE1l9JxMBuBOwqKFN3ID5M5kn0ocxSLGUSB5t8HJbgWyfkuBRgJfyEKS2T LZng== 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=8VSo/FOFUIN2HlCM0Pc7NvFmjWeNEYKwdUKq7A2Cd8w=; b=Sw+PAH7CqWEOBrJuc0EdbLfjQcsZJyRZcXSLPhA80DNjkpichsx3vuoSvhH7H7IAN2 mvmpkAeaIc4IgN+Gun0nNMkgDVEwHLmNOrUEiM5VFuU5hDOqB3wDe5UgCTNOMfHWKke6 hTttF548Z1dy2L8rVbxtQdzuHhiGM7Dt8SaKKMef869QnXIjWKFnLZKH5wd/Dd9HWDMp /ERi3/w9DQVy2mQZH3oyUj5CElfN+9xHjoeXTnzVa57uEMrUNWuGoaPJyXzGILG55xTv CrmkasjA7KoIGr8rD/x/+eqf6gdX5qV0R30o+7Zokx44CdWwn1RulYlZtZKI+LwPcNzY xWQA== X-Gm-Message-State: APjAAAXL1wQ9tIrQVgAlEbxjdFwPVwhSQtjdIpoy9+D1iUGx8eaa/jAw njiELmlnshhpMj6uM++MQelkUhPEDiAivA== X-Google-Smtp-Source: APXvYqxyIy/YPupp5FpspTWBRxUOacziYpaV1kL7e4waxUQnGofQpv1QCVNvStFzK92FlSLrUC1DGA== X-Received: by 2002:adf:e5c2:: with SMTP id a2mr84741wrn.85.1582743923176; Wed, 26 Feb 2020 11:05:23 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id z1sm3932823wmf.42.2020.02.26.11.05.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 11:05:21 -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: [PATCH v3 4/9] ArmVirtPkg: implement ArmVirtPsciResetSystemPeiLib Date: Wed, 26 Feb 2020 20:05:09 +0100 Message-Id: <20200226190514.31395-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200226190514.31395-1-ard.biesheuvel@linaro.org> References: <20200226190514.31395-1-ard.biesheuvel@linaro.org> 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/ArmVirtPsciResetSystemPeiLib.c | 232 ++++++++++++++++++++ ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf | 39 ++++ 2 files changed, 271 insertions(+) diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c new file mode 100644 index 000000000000..394a04e3c384 --- /dev/null +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.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 = (VOID*)(UINTN)PcdGet64 (PcdDeviceTreeInitialBaseAddress); + ASSERT (fdt_check_header (DeviceTreeBase) == 0); + + // + // Enumerate all FDT nodes looking for the PSCI node and capture the method + // + for (Prev = 0;; Prev = Node) { + Node = fdt_next_node (DeviceTreeBase, Prev, NULL); + if (Node < 0) { + break; + } + + Compatible = fdt_getprop (DeviceTreeBase, Node, "compatible", &Len); + if (Compatible == NULL) { + continue; + } + + // + // Iterate over the NULL-separated items in the compatible string + // + for (CompatibleItem = Compatible; CompatibleItem < Compatible + Len; + CompatibleItem += 1 + AsciiStrLen (CompatibleItem)) { + + if (AsciiStrCmp (CompatibleItem, "arm,psci-0.2") != 0) { + continue; + } + + Prop = 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) == 0) { + return PsciMethodHvc; + } else if (AsciiStrnCmp (Prop, "smc", 3) == 0) { + return PsciMethodSmc; + } else { + DEBUG ((DEBUG_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__, + Prop)); + return PsciMethodUnknown; + } + } + } + return PsciMethodUnknown; +} + +STATIC +VOID +PerformPsciAction ( + IN UINTN Arg0 + ) +{ + ARM_SMC_ARGS ArmSmcArgs; + ARM_HVC_ARGS ArmHvcArgs; + + ArmSmcArgs.Arg0 = Arg0; + ArmHvcArgs.Arg0 = 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 shutdown 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 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 + ) +{ + // 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 the 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/ArmVirtPsciResetSystemPeiLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf new file mode 100644 index 000000000000..3a65706e8dc6 --- /dev/null +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.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 = 1.27 + BASE_NAME = ArmVirtPsciResetSystemPeiLib + FILE_GUID = 551cfb98-c185-41a3-86bf-8cdb7e2a530c + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = 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 -- 2.17.1