From patchwork Mon Jul 3 15:02:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106904 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5860463qge; Mon, 3 Jul 2017 08:02:50 -0700 (PDT) X-Received: by 10.98.5.70 with SMTP id 67mr1169103pff.188.1499094170068; Mon, 03 Jul 2017 08:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499094170; cv=none; d=google.com; s=arc-20160816; b=bT9zgm0i57uyOhIffFN7WJr+Ssn91rjfFfWw8M5bvRZrd/f/Vyr9h2i2FqQiwiUr73 prIRQrcf/xAK8f+G1WwnRd/N24z38YQ6vh2NnsQzB8dd9hp2kQ7toBVaiYzxuR3tEP3C 5+Z4bUNuQ7GhyatSbuyZHv/tCVpO5SXLRHe1j+/J2B1WTXNekSN71VPqIlWUAUM0T5WV Lazp9S0YPja6ndYSgTdgsLuHyNToPHrioDJc/EcZe95j80vWvdwprf7RL73POJ2ViNbw 2pcfEYZdYX8Rau9Y0rkEEm7pl6mowWnN9n/X6FpeZakNW0kqFodaGd4Zp2bA9xokAWA8 Nj4Q== 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=WTGMCevV/DcSnW+3lW6BjMDNPwgbFW++WS3RHCFiyDo=; b=RdsinkVd6Izr/pYhUqzRDylRjkdXioryBZ8S9JfedTS7pXvjpLCXv2PWkqRG6qR1YH lzj9l6MpTYiDXs7seMxQ+o441KBAZ/fnGx5l+QjnkYKcdC/ouEuoXjbz9UGKACkO93aV stvy29cN7tuLED4ZacqBWsCtX4+SVNY1y/yAtI2VXelwXN9PhPv2jATQzNzU9TCZGijp udb/rEavp/ip2AqeDzCuzL4W59Sjtd1jWb4TAT9Y8bZRh2psE/Bonf8ytQpO3IcDe5xZ KTTqRaksWoN548FzHbbG47TiMlqAcueEKYDo+Xrhf8EIERwLvZV85QzW3NXVIXoxbtXm wowA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=iHPN39zb; 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 95si877560plc.499.2017.07.03.08.02.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 08:02:50 -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=iHPN39zb; 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 E317A21A00AC2; Mon, 3 Jul 2017 08:01:11 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x229.google.com (mail-wm0-x229.google.com [IPv6:2a00:1450:400c:c09::229]) (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 96D702095A6A6 for ; Mon, 3 Jul 2017 08:01:10 -0700 (PDT) Received: by mail-wm0-x229.google.com with SMTP id f67so57946074wmh.1 for ; Mon, 03 Jul 2017 08:02:47 -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=vzr/VcBOq6tdYGECsb5qx4VNpHgJzItnmfJmOz7Jii8=; b=iHPN39zbEIev/0s4lhNZK/ISV56lu31iKLQORvCAs0vmCk1kIo17wtqaSStvWA1ctG Ye+aRwOqxQ6SmdcKCnEMeGvJWoFmcWCUdSD+UnS9Xq2KpOXXsUyFUAhvtR1Wtu3SmU9M UQTtMkbUNPnjR5GiUUGhdkyB0MNjxDSp93MAI= 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=vzr/VcBOq6tdYGECsb5qx4VNpHgJzItnmfJmOz7Jii8=; b=FoZzAdLPgJMKC7qewC3KHUZ5X9caGvh9V9cwXE9ao7xZa1yAeBf7pz3T9331fe/pTC q+bIplUcAEQ/PtVomYE5HeuP0hW7b7e6oMcYaW6gYpMMnaztT30vxIUcxbJJh3P8ywEz L3AhfXrXXNh7Erf6fQ7MOPWz4EfFHpeHs6WY+D4OkNAAvXuCfXR6C694PbWh87TlvC+c FjNuuJduakQY5ZEEy9tp5pRkvrWPf5pd1K9wpryKvYaGkPfbPUUHBGxr7lFgEJYua1om OC1SsEwv2rQypompkL4SwXJ4Kp6yTlbOmSGApH6V9i/eK+6MVUHaaczyhpojh1Gig5wt BeLg== X-Gm-Message-State: AKS2vOw6EiHEe5BtU1tZeAqWd5dFZWbD8klmywdqzrRKjKEqk9Mghzql UBsUH9PnjdRRYMy8A8jkOQ== X-Received: by 10.28.128.67 with SMTP id b64mr23431726wmd.79.1499094166124; Mon, 03 Jul 2017 08:02:46 -0700 (PDT) Received: from localhost.localdomain ([154.151.196.199]) by smtp.gmail.com with ESMTPSA id y2sm23362561wme.12.2017.07.03.08.02.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 08:02:45 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Mon, 3 Jul 2017 16:02:38 +0100 Message-Id: <20170703150238.32652-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 Subject: [edk2] [PATCH] ArmPkg: implement ResetSystemLib using PSCI 0.2 calls 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 MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" This adds an implementation of the ResetSystemLib library class as defined in MdeModulePkg. It is used as the platform glue by the generic ResetSystemRuntimeDxe which lives in the same package. This implementation is intended to replace the EfiResetSystemLib based implementation that is deprecated now that we have decided that there is no longer a reason to keep a different ResetSystem() implementation under EmbeddedPkg. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c | 115 ++++++++++++++++++++ ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 35 ++++++ 2 files changed, 150 insertions(+) -- 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c new file mode 100644 index 000000000000..d6d26bce5009 --- /dev/null +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c @@ -0,0 +1,115 @@ +/** @file + ResetSystemLib implementation using PSCI calls + + 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 + 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 + +/** + 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 + ) +{ + ARM_SMC_ARGS ArmSmcArgs; + + // Send a PSCI 0.2 SYSTEM_RESET command + ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET; + ArmCallSmc (&ArmSmcArgs); +} + +/** + 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 + ) +{ + ARM_SMC_ARGS ArmSmcArgs; + + // Send a PSCI 0.2 SYSTEM_OFF command + ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF; + ArmCallSmc (&ArmSmcArgs); +} + +/** + 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. +**/ +VOID +EFIAPI +ResetPlatformSpecific ( + IN UINTN DataSize, + IN VOID *ResetData + ) +{ + // Map the platform specific reset as reboot + ResetCold (); +} diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf new file mode 100644 index 000000000000..3e66f75a3498 --- /dev/null +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf @@ -0,0 +1,35 @@ +#/** @file +# ResetSystemLib implementation using PSCI calls +# +# 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 +# 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 = 0x00010019 + BASE_NAME = ArmPsciResetSystemLib + FILE_GUID = 18B12C83-7718-4D83-ADA4-87F2FE698DD4 + MODULE_TYPE = BASE + VERSION_STRING = 1.0 + LIBRARY_CLASS = ResetSystemLib + +[Sources] + ArmSmcPsciResetSystemLib.c + +[Packages] + ArmPkg/ArmPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + ArmSmcLib + BaseLib + DebugLib