From patchwork Mon Jul 3 15:17:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106908 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp10868obb; Mon, 3 Jul 2017 08:18:35 -0700 (PDT) X-Received: by 10.55.141.198 with SMTP id p189mr45546462qkd.97.1499095115568; Mon, 03 Jul 2017 08:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499095115; cv=none; d=google.com; s=arc-20160816; b=PeYrliP+NoWy02c0G/ketHnh3VLC0yxcS/TwiogPLROhaJ3IwfqGkEKCUpi06YOfxA QJWNElTABm/tUJCbqlAsEHGm9J8Dp2QfYifaV5WsmxGTbhqm6636c6LnoYxx6/KSoR9o gFbLzCxf4LIqIyCKHBdbisIb51Oa22EhwV+i+sXZI1JmoVEIP1snyYtTOS8wrvk1GvX6 emsqp3kC6jNIOE98LhEk4yOWzIDYgh2veonQ7vk+KBg9BpsWxJJKCiWED+Rw/1oQ2J47 l0Nv0omhPfVm8VNKqaqR+NFh9Xjd1KYKq15SuH7vcM6jUxYiCJvWUEXyBz9AUvlCS9jc 1yZA== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=sVLpSV/+yDVEJuFekEx1ea6NX7v73ILLljgN0S+rCt0=; b=YMCDhirYy5oWJZn+9ZcDw9Sg+El+ID4kqkpAuWs5Xkp2JaqDuGRTTkcFOcISKrG40F 6ZmWvwvZMGuoGJV5MEQfvyo+/d05diluRPVyGdd8D4DdTaghW+HMLWjL0QCVNxsBRtXS unbCzPNV7TbCAt5Izy9caThcA7D6ngu0PruYyZBzEJucjaV489OcuSZz7DtlSsSpBsw5 7KkCNkn0Fr6N1ktlCoxoupkjZs/j4dELTQ3CYj5372EwwjO8qCZ91GkgB3oj9J7rHg2m XDc3MTcdbOJlCMMP5EV/3UxyEAWsl46MTJYWcx2muI0Yg3vRS0zH0VZlWPbx28oN/HRo 1HWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b25si15081894qtc.47.2017.07.03.08.18.35; Mon, 03 Jul 2017 08:18:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3899260B33; Mon, 3 Jul 2017 15:18:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9B76660B06; Mon, 3 Jul 2017 15:18:16 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 7767B60B05; Mon, 3 Jul 2017 15:18:09 +0000 (UTC) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by lists.linaro.org (Postfix) with ESMTPS id E960D60967 for ; Mon, 3 Jul 2017 15:18:06 +0000 (UTC) Received: by mail-wm0-f53.google.com with SMTP id f67so58406654wmh.1 for ; Mon, 03 Jul 2017 08:18:06 -0700 (PDT) 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=gwyeJRD8VIJcE3Noj5eQzVejzs1ivdwAeQjPJpfsWso=; b=fJW2cx9C3m7cMl0yZiChTNk4snUF0Ho7wfd563ClOXn3e7yOVrKX87960RY7IByatU T0W05h8Z2oTcpyUQA+W4tulA4i7XAL8YZxOfWhBRfdcRnlLlf0D+qx9oiWdTfh/+YM/j FdCFexKX4RRUB9VcmsUPvr7SpSVvNl6ceh+uuQjGOsbSqjOO/oJHSFImMpHr5mcAwi1H fVID5cK+yXNTLMEaP7350IRklM2aMbuz4JMYVtosLLMqdBoIuPbaQR6SJZbVNx7wFDsq xykb3lwUQ9Bmoq9ubLAW0TutsANj2uBictzzR3mO2PkQVWsKCdW6lUcCy4OwInzN2uhg kzcQ== X-Gm-Message-State: AKS2vOw9kcg2pgHbJOgr0E7jVagErcfAk9EyHcSc+mf3e49NoagNfkWh 4WHzR0QKMLxIJhndQ8E37VQ/ X-Received: by 10.28.128.215 with SMTP id b206mr15699530wmd.61.1499095085639; Mon, 03 Jul 2017 08:18:05 -0700 (PDT) Received: from localhost.localdomain ([154.151.196.199]) by smtp.gmail.com with ESMTPSA id o4sm17809309wrb.27.2017.07.03.08.18.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 08:18:04 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, leif.lindholm@linaro.org Date: Mon, 3 Jul 2017 16:17:55 +0100 Message-Id: <20170703151757.8413-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170703151757.8413-1-ard.biesheuvel@linaro.org> References: <20170703151757.8413-1-ard.biesheuvel@linaro.org> Cc: alan@softiron.co.uk, chenhui.sun@linaro.org Subject: [Linaro-uefi] [PATCH 1/3] Platforms/AMD/Styx: switch to generic ResetSystemRuntimeDxe X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Switch to the generic implementation of the ResetSystem() runtime service call, which is preferred over the one in EmbeddedPkg. Since this involves switching to another platform reset library class (ResetSystemLib vs EfiResetSystemLib), of which a perfectly suitable implementation exists for PSCI basd platforms such as Styx, don't bother porting the existing EfiResetSystemLib implementation, but simply delete it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 4 +- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 2 +- Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.c | 113 -------------------- Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.inf | 47 -------- Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc | 4 +- Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf | 2 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 4 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 2 +- 8 files changed, 9 insertions(+), 169 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index a7b3e4bb2e32..e02adf65e512 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -121,7 +121,7 @@ DEFINE RTK8169_MAC_OVERRIDE = 0x0 # AmdSataInit|AmdModulePkg/Library/AmdSataInitLib/AmdSataInitLib.inf AmdStyxAcpiLib|OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf - EfiResetSystemLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.inf + ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf RealTimeClockLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf @@ -529,7 +529,7 @@ DEFINE RTK8169_MAC_OVERRIDE = 0x0 MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 30ea6ac08ab4..010993291ee6 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -102,7 +102,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.c b/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.c deleted file mode 100644 index 90eec09b1b88..000000000000 --- a/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.c +++ /dev/null @@ -1,113 +0,0 @@ -/** @file - Support ResetSystem Runtime call using PSCI calls - - Note: A similar library is implemented in - ArmVirtPkg/Library/ArmVirtualizationPsciResetSystemLib - So similar issues might exist in this implementation too. - - Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
- Copyright (c) 2013-2015, ARM Ltd. All rights reserved.
- Copyright (c) 2014, Linaro Ltd. All rights reserved.
- Copyright (c) 2014 - 2016, AMD Inc. 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. - -**/ -/** - Derived from: - ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c - -**/ - -#include - -#include -#include -#include -#include - -#include - -/** - 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. - -**/ -EFI_STATUS -EFIAPI -LibResetSystem ( - IN EFI_RESET_TYPE ResetType, - IN EFI_STATUS ResetStatus, - IN UINTN DataSize, - IN CHAR16 *ResetData OPTIONAL - ) -{ - ARM_SMC_ARGS ArmSmcArgs; - - if (!FixedPcdGetBool (PcdTrustedFWSupport)) { - return EFI_UNSUPPORTED; - } - - switch (ResetType) { - case EfiResetPlatformSpecific: - // Map the platform specific reset as reboot - case EfiResetWarm: - // Map a warm reset into a cold reset - case EfiResetCold: - // Send a PSCI 0.2 SYSTEM_RESET command - ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET; - break; - case EfiResetShutdown: - // Send a PSCI 0.2 SYSTEM_OFF command - ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF; - break; - default: - ASSERT (FALSE); - return EFI_UNSUPPORTED; - } - - ArmCallSmc (&ArmSmcArgs); - - // We should never be here - DEBUG ((EFI_D_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__)); - CpuDeadLoop (); - return EFI_UNSUPPORTED; -} - - -/** - 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. - -**/ -EFI_STATUS -EFIAPI -LibInitializeResetSystem ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - - if (FixedPcdGetBool (PcdTrustedFWSupport)) { - return EFI_SUCCESS; - } else { - return EFI_UNSUPPORTED; - } -} - diff --git a/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.inf b/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.inf deleted file mode 100644 index 5af4c9c449b6..000000000000 --- a/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.inf +++ /dev/null @@ -1,47 +0,0 @@ -#/** @file -# Reset System lib using PSCI hypervisor or secure monitor calls -# -# Copyright (c) 2008, Apple Inc. All rights reserved.
-# Copyright (c) 2014, Linaro Ltd. All rights reserved.
-# Copyright (c) 2014, ARM Ltd. All rights reserved.
-# Copyright (c) 2014 - 2016, AMD Inc. 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. -# -#**/ -#/** -# Derived from: -# ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf -# -#**/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = AmdStyxResetSystemLib - FILE_GUID = 624f6cc6-c38f-4897-b3b7-8a601701291b - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = EfiResetSystemLib - -[Sources.common] - ResetSystemLib.c - -[Packages] - ArmPkg/ArmPkg.dec - MdePkg/MdePkg.dec - EmbeddedPkg/EmbeddedPkg.dec - AmdModulePkg/AmdModulePkg.dec - OpenPlatformPkg/Platforms/AMD/Styx/AmdStyx.dec - -[LibraryClasses] - PcdLib - BaseLib - ArmSmcLib - -[FixedPcd] - gAmdStyxTokenSpaceGuid.PcdTrustedFWSupport diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc index 5b7d7f4a7b4a..1c85b5fc740a 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc @@ -122,7 +122,7 @@ DEFINE DO_FLASHER = FALSE # AmdSataInit|AmdModulePkg/Library/AmdSataInitLib/AmdSataInitLib.inf AmdStyxAcpiLib|OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf - EfiResetSystemLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.inf + ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf RealTimeClockLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf @@ -526,7 +526,7 @@ DEFINE DO_FLASHER = FALSE MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf index c7f98b087fa9..278f497afbbf 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf @@ -102,7 +102,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 662a15a9ccea..4fb13206db06 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -123,7 +123,7 @@ DEFINE DO_FLASHER = FALSE # AmdSataInit|AmdModulePkg/Library/AmdSataInitLib/AmdSataInitLib.inf AmdStyxAcpiLib|OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiTables.inf - EfiResetSystemLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/ResetSystemLib/ResetSystemLib.inf + ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf RealTimeClockLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf @@ -567,7 +567,7 @@ DEFINE DO_FLASHER = FALSE MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index d51bed87ebf6..ac683c9e38e3 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -102,7 +102,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf From patchwork Mon Jul 3 15:17:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106910 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp11392obb; Mon, 3 Jul 2017 08:19:04 -0700 (PDT) X-Received: by 10.107.189.68 with SMTP id n65mr39300645iof.223.1499095143976; Mon, 03 Jul 2017 08:19:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499095143; cv=none; d=google.com; s=arc-20160816; b=t5GTWUaCa62SbEpZK6CkFlxnmAyt4uVGOnmjd+oCj2AFY/XFiuxBKdK0U+Ps8wi52C jaG0fdJbcHvlV8PQjaigiZj8/aqfuKXfllaa/famwv9WF77Va2V6GS8tAaoDcLgzBj20 OR46/Yf4A5m38bBPh68z1kOaUSXRqYbt413TRWlrfDnGIWVXqOLXVb/pkF5UXJjXLgoi 4KOn74RTEwcdl9uZK4Dd9fhi7EHYj5iJN9D6ZxBqBTodR0Nh2OHmVcCGnjP/YPLArzxL Zo6DumHiQHwRkHyYQJPukwdcVppXo1vkwqvFZdW3e7irRsE8PXuokGGSHnGBR5BG4i9J SYtQ== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=Rotex1J4onUAYlP/uESN43eo3ILTRjKvdt5TpycREik=; b=JDY7df6xDoMcTjGra4YaGgYoStJtdzJxH6WRhcKXP7e6+dyxZOIEqgbsqXYz0ctOVV p9tpyXAMd6jQ4yjyuHpH9ELjev2p2k/lO+xNbylJrOG6Ko6KPoMbSY1fs2BRZZx2cqgA aQgZRRVnqTCjOTp5KzbuwHDy3Ht9SEKOv3Uldojfok7lVRaZ0hPja6xWqqQFXqrKfZLQ CZLoBdMV3hAoI4+8WR+4PWThfUExMkmjXTnyUEgpOxxW25/mV0947XAs2WhkOlHzyHVG VI5hyW8/5uD53UupZKwAkrQKpj+op13Z4me433ff/Qbmc33cHM20mtqieUlD5XA5P6FD wkKw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id c92si18915561itd.67.2017.07.03.08.19.02; Mon, 03 Jul 2017 08:19:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id DD05B60B0F; Mon, 3 Jul 2017 15:19:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2132960AFA; Mon, 3 Jul 2017 15:18:29 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0F94D60AF7; Mon, 3 Jul 2017 15:18:24 +0000 (UTC) Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by lists.linaro.org (Postfix) with ESMTPS id AF53D60AFA for ; Mon, 3 Jul 2017 15:18:08 +0000 (UTC) Received: by mail-wm0-f49.google.com with SMTP id z75so38832761wmc.0 for ; Mon, 03 Jul 2017 08:18:08 -0700 (PDT) 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=mR+1zF1AB28/+N4+oSa0mUeXhPlo08ctlmKtePUjjTU=; b=jiYqlAfysaNPAiVhYPNU0WugGvWSxAw45USISS+IRiGF7nhIqKUgRXcvx9gIGVupDc CadeaQp8/OqQ6w5VcSQeIRsrFV1L9zDUhA+WxOiSrIPZOHxgFXP5Y3WyC7ZZDAoUzkF3 fg8bvwBKzcF0wkk+zuKHMOhWiKTX5yqPhABjsnHKT/ctBjU8NYJ9bfKkxYrmtLbQmlcg Xng0DhowwMtwzrBNFFf1Btuj5KUDdilLxKFkHQ7fn2YZ6j5/MKz9ZIxnS6Nzt3CiR5WO S6zUqtbKDA/PaKeot7qBPrdYuMfdfxngDEjC/IeZLBgITCfwoH7JiuqzyUOvvrkRFkL9 O1Xg== X-Gm-Message-State: AIVw112onKXi+rlD2mkwbBmaqptzF/JhZn2lwDaAW+6hpjCtbswutXcQ ij5jdHYP4ZGSKqWwjmswMaZC X-Received: by 10.28.217.3 with SMTP id q3mr5792730wmg.115.1499095087265; Mon, 03 Jul 2017 08:18:07 -0700 (PDT) Received: from localhost.localdomain ([154.151.196.199]) by smtp.gmail.com with ESMTPSA id o4sm17809309wrb.27.2017.07.03.08.18.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 08:18:06 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, leif.lindholm@linaro.org Date: Mon, 3 Jul 2017 16:17:56 +0100 Message-Id: <20170703151757.8413-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170703151757.8413-1-ard.biesheuvel@linaro.org> References: <20170703151757.8413-1-ard.biesheuvel@linaro.org> Cc: alan@softiron.co.uk, chenhui.sun@linaro.org Subject: [Linaro-uefi] [PATCH 2/3] Platforms/Hisilicon: switch to generic ResetSystemRuntimeDxe X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Switch to the generic implementation of the ResetSystem() runtime service call, which is preferred over the one in EmbeddedPkg. This involves selecting another DXE runtime driver, and another library class resolution for the platform glue. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Chips/Hisilicon/Hisilicon.dsc.inc | 2 +- Platforms/Hisilicon/D02/Pv660D02.dsc | 2 +- Platforms/Hisilicon/D02/Pv660D02.fdf | 2 +- Platforms/Hisilicon/D03/D03.dsc | 2 +- Platforms/Hisilicon/D03/D03.fdf | 2 +- Platforms/Hisilicon/D05/D05.dsc | 2 +- Platforms/Hisilicon/D05/D05.fdf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Chips/Hisilicon/Hisilicon.dsc.inc b/Chips/Hisilicon/Hisilicon.dsc.inc index b13be3143cd5..094efb42977b 100644 --- a/Chips/Hisilicon/Hisilicon.dsc.inc +++ b/Chips/Hisilicon/Hisilicon.dsc.inc @@ -68,7 +68,7 @@ # Versatile Express Specific Libraries ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf NorFlashPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf - EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf + ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf # ARM PL111 Lcd Driver LcdPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc index b61157905829..6e942a0ad6c3 100644 --- a/Platforms/Hisilicon/D02/Pv660D02.dsc +++ b/Platforms/Hisilicon/D02/Pv660D02.dsc @@ -321,7 +321,7 @@ EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf diff --git a/Platforms/Hisilicon/D02/Pv660D02.fdf b/Platforms/Hisilicon/D02/Pv660D02.fdf index 406b501f8b7d..7e90a1918652 100644 --- a/Platforms/Hisilicon/D02/Pv660D02.fdf +++ b/Platforms/Hisilicon/D02/Pv660D02.fdf @@ -175,7 +175,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.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/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc index ca6295e07ce9..42553e9e0753 100644 --- a/Platforms/Hisilicon/D03/D03.dsc +++ b/Platforms/Hisilicon/D03/D03.dsc @@ -374,7 +374,7 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf { CpldIoLib|OpenPlatformPkg/Chips/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.inf diff --git a/Platforms/Hisilicon/D03/D03.fdf b/Platforms/Hisilicon/D03/D03.fdf index 3102f9459925..691c5ca46482 100644 --- a/Platforms/Hisilicon/D03/D03.fdf +++ b/Platforms/Hisilicon/D03/D03.fdf @@ -169,7 +169,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.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/Platforms/Hisilicon/D05/D05.dsc b/Platforms/Hisilicon/D05/D05.dsc index c1f4dfdda4f1..a22af3abaf2f 100644 --- a/Platforms/Hisilicon/D05/D05.dsc +++ b/Platforms/Hisilicon/D05/D05.dsc @@ -494,7 +494,7 @@ MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf { CpldIoLib|OpenPlatformPkg/Chips/Hisilicon/Library/CpldIoLib/CpldIoLibRuntime.inf diff --git a/Platforms/Hisilicon/D05/D05.fdf b/Platforms/Hisilicon/D05/D05.fdf index 5a646f3825be..0b2eff0b9c26 100644 --- a/Platforms/Hisilicon/D05/D05.fdf +++ b/Platforms/Hisilicon/D05/D05.fdf @@ -173,7 +173,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf From patchwork Mon Jul 3 15:17:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106911 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp11688obb; Mon, 3 Jul 2017 08:19:21 -0700 (PDT) X-Received: by 10.107.6.203 with SMTP id f72mr34971698ioi.144.1499095161219; Mon, 03 Jul 2017 08:19:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499095161; cv=none; d=google.com; s=arc-20160816; b=URdnT7ZpPDULRz1oiKes1DxY8a9P2ZYeIVcQV1tBsbCMRBatBcaFxDDWp/KSXJkJtF OEpLjLVHj6L508drAtkqeOLN116Fz9+eoXaZKCPZ0IOrFQ+k59BZYcOYUHJV10zSaiD3 3lA4GYGRJHfoV0BLfrIqwbc9/YqFiNtq6UfIElrwiMbyMc+k3L7EkFr+SFyoGANLDkBY 4b5GPmtD0AZHf8MZzhdVdrhGkoaw2WorK0Q2FRxCxecbupab9Qi+2x1KNu68gbVpxM5+ GPaljf7UF4SgXuqp0ThRWMC02QxfP4qzKF+xuXsUwjuknKtqS7B92bfiKpHjPdt5JYrD Typw== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=Abl+7yd8EWFsNTkTuwHj2ZDvdHw3u4vTAdkGdBmdVpI=; b=BOfLVGKJSDPqWHHFwuc4aohueRr6FOoTHdp3AYTH6Q5Ff14UQWI4hxyO3+VAgMMITh qZq0Mh0/UHdF/jTbjDijDGGWVHXrUT06Qiz7hIOPHGUNuBl209AOqZfqiecB9JgQQl9D qZRNqTGs1zdAg1qJTmeWOFd3nC+1GEwpVHQnssXt7G4Rvm8J2oMryc+yvMPRSV5OK783 8lNiiwT4s0hhixijHOy5Lv9lHM4ucKL1g3R7hW6mCxPQjM30zVZPQ2k8/yYd++9yHXJD qtD8JaRv2YDN2n4bJIstmLHi2SstQXgp9NAhxejyxfTCNeEN6juo+7TKLr7xSONUH4jF Pcmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 197si11816886iti.120.2017.07.03.08.19.20; Mon, 03 Jul 2017 08:19:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B337660B0F; Mon, 3 Jul 2017 15:19:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 59F5960AF7; Mon, 3 Jul 2017 15:18:32 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E744660AF7; Mon, 3 Jul 2017 15:18:24 +0000 (UTC) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by lists.linaro.org (Postfix) with ESMTPS id 938D060967 for ; Mon, 3 Jul 2017 15:18:10 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id i127so112119900wma.0 for ; Mon, 03 Jul 2017 08:18:10 -0700 (PDT) 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=ZnuXAMA6jF97SAbXrXRhARD5qvCJ4bZixGJ7sW6eQMw=; b=qKXE6a+uezj65sLAKP8EJZvSxrzuW/jpKAHRlnHWl0/UR1oJMmhVHRqJMKF2adpQOK OG7rt3LeKTvaSCu2hJW60GXnRj11igW44L5myxzvYxfbV/G7SZgJP2Abqw6m5N4jkWgF rnBtPxIHzC4I9Z4Sd/gtHu00Sm/TJpWXCIuJFztFenJUY7WB/RYFofsQDZD1dShcVajV cY95E1qGsiWGWEJvl4A84ZoZigmiHfYg2f9gqRcf0bhN4BNK/DhA81QFWfjgiJR7lCiT Scr+3/cn34nO3f8946BMgC1Ocd1r2kyZhG41TskN+IauFITsM+FDU45vQ+gMDv7hsYs7 lwsw== X-Gm-Message-State: AKS2vOx2DNExdPEXctvbutknxiDv+JKExbR2PS4u0v5kn/ROHnODQ6Hn jV43B/zIHlVU4sIYTU1YEh04 X-Received: by 10.28.229.209 with SMTP id c200mr20712977wmh.43.1499095089442; Mon, 03 Jul 2017 08:18:09 -0700 (PDT) Received: from localhost.localdomain ([154.151.196.199]) by smtp.gmail.com with ESMTPSA id o4sm17809309wrb.27.2017.07.03.08.18.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jul 2017 08:18:08 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, leif.lindholm@linaro.org Date: Mon, 3 Jul 2017 16:17:57 +0100 Message-Id: <20170703151757.8413-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170703151757.8413-1-ard.biesheuvel@linaro.org> References: <20170703151757.8413-1-ard.biesheuvel@linaro.org> Cc: alan@softiron.co.uk, chenhui.sun@linaro.org Subject: [Linaro-uefi] [PATCH 3/3] Platforms/HiKey: switch to generic ResetSystemRuntimeDxe X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Switch to the generic implementation of the ResetSystem() runtime service call, which is preferred over the one in EmbeddedPkg. This involves selecting another DXE runtime driver, and another library class resolution for the platform glue. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/Hisilicon/HiKey/HiKey.dsc | 4 ++-- Platforms/Hisilicon/HiKey/HiKey.fdf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Platforms/Hisilicon/HiKey/HiKey.dsc b/Platforms/Hisilicon/HiKey/HiKey.dsc index 773c5809aa5d..b6f6a686c3ff 100644 --- a/Platforms/Hisilicon/HiKey/HiKey.dsc +++ b/Platforms/Hisilicon/HiKey/HiKey.dsc @@ -56,7 +56,7 @@ DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf - EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf + ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf @@ -366,7 +366,7 @@ MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf - EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf diff --git a/Platforms/Hisilicon/HiKey/HiKey.fdf b/Platforms/Hisilicon/HiKey/HiKey.fdf index 9c8c54a3f9fc..3f01299f7708 100644 --- a/Platforms/Hisilicon/HiKey/HiKey.fdf +++ b/Platforms/Hisilicon/HiKey/HiKey.fdf @@ -96,7 +96,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf INF EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf - INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf