From patchwork Wed Jun 13 08:08:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138424 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp401550lji; Wed, 13 Jun 2018 01:09:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKgius9g7TmwGXiflZFx7NfRhmHTM+P7JIojomJr20fwalElrdkJG0gXuqo3nWnQ0JCnZCM X-Received: by 2002:a37:c598:: with SMTP id k24-v6mr3460384qkl.153.1528877349684; Wed, 13 Jun 2018 01:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528877349; cv=none; d=google.com; s=arc-20160816; b=0kdkjL6I241vFM5TJz/haBiGvfzMKBop2n4FArKhKYHm833Iu+8lKzV0riOzOXWfa9 IbKOeiRb1Mu5jMDCyCBlkq/viTgKWN+pgtS5e5x/1WF9I6Kgo7KMbsB5PnpWWUHK2u6u QEs/GH31fv2W29WfKHodZ3yCv4XH2proTYzrAhXF56hiI4myePjOWXhygEm7HlPqj1Qc 07RAtjUGWLl8UM/VKi6gO0RFMTaT7pTmLOeTMeYiLho3SXjm+kudJQa5fj+TKzkH1Hn4 fwAnxC2oM8fHPD3PWsdKaYIffFQUdEifcre1amiKKzYOfQW5IzcqlPw7NCrKL5RpaKkO 157g== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=dEo/qH9ERlYRKAzqdnMqGJKCPdvSFKXf5Olmw/JBCvc=; b=KtgSkVfUJlH68ImCK1VS+NvBdP2NmbyxkxdPRkIK9eR4joKZF5v7+AorcxU9oBUJ0h dqvBgp31SKtoYQCqbCAsvNZp6nly5VEaXnb2YsXyjtXPYXOKqGPjfiXFyhHFsMM1p0no qS/g11VjsIo7zV2yH3bIMQw+hTyt9T23aDP1XIbc+TzK7S52ONYy5xMl0kevijq1IAvu aT3ytmqMuqFJZtTwfPm3Pd5Oo+5R9L5gkF22Tgz+kXTHO3K4j6wsfC44GXaq5CX6RmFE ueaJ2p87yjpKe9OjntFQ3Rm7jT4u1X3mZ3BChFKTz190YdoOp2WXXvRsx81EnIb6HIq8 gtfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ey5OZ58U; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id f2-v6si2207353qta.209.2018.06.13.01.09.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ey5OZ58U; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 B74012129DBB4; Wed, 13 Jun 2018 01:09:08 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::244; helo=mail-wr0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (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 CAC60212532FC for ; Wed, 13 Jun 2018 01:09:07 -0700 (PDT) Received: by mail-wr0-x244.google.com with SMTP id k16-v6so1706805wro.0 for ; Wed, 13 Jun 2018 01:09:07 -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:in-reply-to:references; bh=0SjQw8NZf56wNaiOjcfCkQOwuqdnx8aQ3teqfAvPg9Q=; b=ey5OZ58U2ZYaqxTSviLzLh9B9vpETvSt0QDq+VsEoSXeZyMbQW5vADqwaODqWQkdI2 qZ4+jkLStbpoWf8EkwML/zYhEdKOvurWH73bIPByzqzzOqgwi9k/pUk3O1CkgcH1wlfX yV/pdXGIub6vsl0/ZYSpo1vLLA19VeXuVQKOg= 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=0SjQw8NZf56wNaiOjcfCkQOwuqdnx8aQ3teqfAvPg9Q=; b=tD3bIGMnnr0zY6O8dUneQon++4QZErBDU9uI+EXyb+NTNpdELjtYgxvbNttA2TisCe 9wtwdhNNjUvLG1cEw/QSa3SbiGBuIBubEaqYZv7CXG722V0QwHlkDLNivXF95GbHVMBQ 3WTNNbbvwEL2il8wYGo/DsFFGn3XqdLDXy4MSgCGTlsongLJ7u1OdsElYyV8BmALCxal az/DrOqWPIE5/Uq+EvkVhd1icqW6tiBruGkDJwdvyEKwrtQGEzHNT1RF9EcuSjhMZxoV SlS2tXBEuKigJy6ExSdT65al+Fm4EtVu64F5ie4jsGN5CORrdmkMDUtxzRzY5Iwh2WSu A7Ig== X-Gm-Message-State: APt69E0KEyEgclY1IuYK7QJXEzR/H8jTA/+FsGr4cO5QPnF1yJrbCAw7 3xGfTa7LCKP5wn1WYYddVo+rgVmUVV0= X-Received: by 2002:adf:fd05:: with SMTP id e5-v6mr3108779wrr.280.1528877345890; Wed, 13 Jun 2018 01:09:05 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:6dfc:b76c:4240:35ff]) by smtp.gmail.com with ESMTPSA id v31-v6sm4974772wrc.80.2018.06.13.01.09.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:05 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 13 Jun 2018 10:08:58 +0200 Message-Id: <20180613080901.7156-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613080901.7156-1-ard.biesheuvel@linaro.org> References: <20180613080901.7156-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v4 1/4] MdeModulePkg/CapsuleRuntimeDxe: clean the capsule payload to DRAM X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.d.kinney@intel.com, jiewen.yao@intel.com, star.zeng@intel.com, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When capsule updates are staged for processing after a warm reboot, they are copied into memory with the MMU and caches enabled. When the capsule PEI gets around to coalescing the capsule, the MMU and caches may still be disabled, and so on architectures where uncached accesses are incoherent with the caches (such as ARM and AARCH64), we need to ensure that the data passed into UpdateCapsule() is written back to main memory before performing the warm reboot. Unfortunately, on ARM, the only type of cache maintenance instructions that are suitable for this purpose operate on virtual addresses only, and given that the UpdateCapsule() prototype includes the physical address of a linked list of scatter/gather data structures that are mapped at an address that is unknown to the firmware (and may not even be mapped at all when UpdateCapsule() is invoked), we can only perform this cache maintenance at boot time. Fortunately, both Windows and Linux only invoke UpdateCapsule() before calling ExitBootServices(), so this is not a problem in practice. In the future, we may propose adding a secure firmware service that permits performing the cache maintenance at OS runtime, in which case this code may be enhanced to call that service if available. For now, we just fail any UpdateCapsule() calls performed at OS runtime on ARM. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c | 77 ++++++++++++++++++++ MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c | 51 +++++++++++++ MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf | 14 +++- MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c | 33 ++------- MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h | 73 +++++++++++++++++++ 5 files changed, 219 insertions(+), 29 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Signed-off-by: Ard Biesheuvel Reviewed-by: Jiewen.yao@intel.com diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c new file mode 100644 index 000000000000..7e0ca06ce7d0 --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CapsuleReset.c @@ -0,0 +1,77 @@ + /** @file + ARM implementation of architecture specific routines related to + PersistAcrossReset capsules + + Copyright (c) 2018, 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 "CapsuleService.h" + +#include + +/** + Whether the platform supports capsules that persist across reset. Note that + some platforms only support such capsules at boot time. + + @return TRUE if a PersistAcrossReset capsule may be passed to UpdateCapsule() + at this time + FALSE otherwise +**/ +BOOLEAN +EFIAPI +IsPersistAcrossResetCapsuleSupported ( + VOID + ) +{ + // + // ARM requires the capsule payload to be cleaned to the point of coherency + // (PoC), but only permits doing so using cache maintenance instructions that + // operate on virtual addresses. Since at runtime, we don't know the virtual + // addresses of the data structures that make up the scatter/gather list, we + // cannot perform the maintenance, and all we can do is give up. + // + return FeaturePcdGet (PcdSupportUpdateCapsuleReset) && !EfiAtRuntime (); +} + +/** + Writes Back a range of data cache lines covering a set of capsules in memory. + + Writes Back the data cache lines specified by ScatterGatherList. + + @param ScatterGatherList Physical address of the data structure that + describes a set of capsules in memory + +**/ +VOID +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ) +{ + EFI_CAPSULE_BLOCK_DESCRIPTOR *Desc; + + Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)ScatterGatherList; + do { + WriteBackDataCacheRange (Desc, sizeof *Desc); + + if (Desc->Length > 0) { + WriteBackDataCacheRange ((VOID *)(UINTN)Desc->Union.DataBlock, + Desc->Length + ); + Desc++; + } else if (Desc->Union.ContinuationPointer > 0) { + Desc = (EFI_CAPSULE_BLOCK_DESCRIPTOR *)(UINTN)Desc->Union.ContinuationPointer; + } + } while (Desc->Length > 0 || Desc->Union.ContinuationPointer > 0); + + WriteBackDataCacheRange (Desc, sizeof *Desc); +} diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c new file mode 100644 index 000000000000..09616999e3f8 --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleReset.c @@ -0,0 +1,51 @@ +/** @file + Default implementation of architecture specific routines related to + PersistAcrossReset capsules + + Copyright (c) 2018, 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 "CapsuleService.h" + +/** + Whether the platform supports capsules that persist across reset. Note that + some platforms only support such capsules at boot time. + + @return TRUE if a PersistAcrossReset capsule may be passed to UpdateCapsule() + at this time + FALSE otherwise +**/ +BOOLEAN +EFIAPI +IsPersistAcrossResetCapsuleSupported ( + VOID + ) +{ + return FeaturePcdGet (PcdSupportUpdateCapsuleReset); +} + +/** + Writes Back a range of data cache lines covering a set of capsules in memory. + + Writes Back the data cache lines specified by ScatterGatherList. + + @param ScatterGatherList Physical address of the data structure that + describes a set of capsules in memory + +**/ +VOID +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ) +{ +} diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf index 9ab04ce1b301..43a29ee22948 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf @@ -27,17 +27,24 @@ [Defines] # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC ARM AARCH64 # [Sources] CapsuleService.c + CapsuleService.h -[Sources.Ia32, Sources.IPF, Sources.EBC, Sources.ARM, Sources.AARCH64] +[Sources.Ia32, Sources.IPF, Sources.EBC] SaveLongModeContext.c + CapsuleReset.c [Sources.X64] X64/SaveLongModeContext.c + CapsuleReset.c + +[Sources.ARM, Sources.AARCH64] + SaveLongModeContext.c + Arm/CapsuleReset.c [Packages] MdePkg/MdePkg.dec @@ -59,6 +66,9 @@ [LibraryClasses.X64] UefiLib BaseMemoryLib +[LibraryClasses.ARM, LibraryClasses.AARCH64] + CacheMaintenanceLib + [Guids] ## SOMETIMES_PRODUCES ## Variable:L"CapsuleUpdateData" # (Process across reset capsule image) for capsule updated data ## SOMETIMES_PRODUCES ## Variable:L"CapsuleLongModeBuffer" # The long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce code to handle >4GB capsule blocks diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c index 216798d1617e..23fd6d59c59e 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c @@ -15,22 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "CapsuleService.h" + // // Handle for the installation of Capsule Architecture Protocol. // @@ -44,15 +30,6 @@ UINTN mTimes = 0; UINT32 mMaxSizePopulateCapsule = 0; UINT32 mMaxSizeNonPopulateCapsule = 0; -/** - Create the variable to save the base address of page table and stack - for transferring into long mode in IA32 PEI. -**/ -VOID -SaveLongModeContext ( - VOID - ); - /** Passes capsules to the firmware with both virtual and physical mapping. Depending on the intended consumption, the firmware may process the capsule immediately. If the payload should persist @@ -194,10 +171,12 @@ UpdateCapsule ( // // Check if the platform supports update capsule across a system reset // - if (!FeaturePcdGet(PcdSupportUpdateCapsuleReset)) { + if (!IsPersistAcrossResetCapsuleSupported ()) { return EFI_UNSUPPORTED; } + CapsuleCacheWriteBack (ScatterGatherList); + // // Construct variable name CapsuleUpdateData, CapsuleUpdateData1, CapsuleUpdateData2... // if user calls UpdateCapsule multiple times. @@ -344,7 +323,7 @@ QueryCapsuleCapabilities ( // //Check if the platform supports update capsule across a system reset // - if (!FeaturePcdGet(PcdSupportUpdateCapsuleReset)) { + if (!IsPersistAcrossResetCapsuleSupported ()) { return EFI_UNSUPPORTED; } *ResetType = EfiResetWarm; diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h new file mode 100644 index 000000000000..85aafc144b41 --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h @@ -0,0 +1,73 @@ +/** @file + Capsule Runtime Driver produces two UEFI capsule runtime services. + (UpdateCapsule, QueryCapsuleCapabilities) + It installs the Capsule Architectural Protocol defined in PI1.0a to signify + the capsule runtime services are ready. + + Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2018, 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 +#include +#include +#include +#include +#include +#include +#include +#include + +/** + Create the variable to save the base address of page table and stack + for transferring into long mode in IA32 PEI. +**/ +VOID +SaveLongModeContext ( + VOID + ); + +/** + Whether the platform supports capsules that persist across reset. Note that + some platforms only support such capsules at boot time. + + @return TRUE if a PersistAcrossReset capsule may be passed to UpdateCapsule() + at this time + FALSE otherwise +**/ +BOOLEAN +EFIAPI +IsPersistAcrossResetCapsuleSupported ( + VOID + ); + +/** + Writes Back a range of data cache lines covering a set of capsules in memory. + + Writes Back the data cache lines specified by ScatterGatherList. + + @param ScatterGatherList Physical address of the data structure that + describes a set of capsules in memory + +**/ +VOID +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ); From patchwork Wed Jun 13 08:08:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138425 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp401591lji; Wed, 13 Jun 2018 01:09:11 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKlenh5Hil3f3Sjgjn1WRutYpgFOnwz5Pvy5Ml25vRjVDsxWPtmQ5og8FkeorYIeCms61/Q X-Received: by 2002:a17:902:44a4:: with SMTP id l33-v6mr4093972pld.134.1528877351764; Wed, 13 Jun 2018 01:09:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528877351; cv=none; d=google.com; s=arc-20160816; b=mqAfGIAKQ6+FV0NGCJmZT7sCEm+gMyXYmOR74XEaJFXFh6muIWMwOfDOn4TCJ+hkD7 oM4TkW38gNNFWMZzcqRraQclEv5LGzknhamQb1GprC00Qtb9KafKna9c2k6w2ekI9nVH Ewc8Dr44ywGsh0++arqGiRY448oFIxROLz2Tc8nXIsxnIJrR/0wbe0dKPk21U/DgaFSt 6gLFpfTOKND3pz1MKGAfvNGSeIl+p2/aM0QvkN8b5Y4UuiCRmjVXyLoHjeq0m4KU/RoZ 1H2MgtMG+Px+o7CNBkRZylNUhS/gvXWOJj3ocjgvnQsFcqOhyqnBFLmF3bniD0uOPpkA SJrw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=iz7urHGqiq6FqKtb48eeuE/r0G3f1mwQM8dEVJ4Ej1M=; b=CORltqMmBRfcEF+PVyGG03sVeTtmTwGyCalFHKuwFmgLn2Vyww0SrHt+NR7FAzMpui MLwCJuhTxx1YuGZZDsvtw6WYoycHRJZ7scFD58mkDvPLrufLXkHb2iT2wC3PjQWsT0Oz NozD+Lv/VfgBet5/CdbN1Aiol903gMH4KrLky2ckYVnAeQxtWcFC+Io4/uaS9qpA2/6m wIpKk6SRhltaQX0cTXR/pxzjUIEibgrssvU8t+TmCYjkFnCXIO16ZYytLwWI+6JDy0lQ n0E0GwwEP/m61mJgFwMuFx4iOoxwWhTdxk/CQ3QK9lyJkR2GrB8hPMixlvoTOO9n/wxz 01bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ug+dL0yZ; 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 u17-v6si2251795plq.405.2018.06.13.01.09.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:11 -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.s=google header.b=Ug+dL0yZ; 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 E11E4212C01F5; Wed, 13 Jun 2018 01:09:10 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::233; helo=mail-wr0-x233.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x233.google.com (mail-wr0-x233.google.com [IPv6:2a00:1450:400c:c0c::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 0FF20212532FC for ; Wed, 13 Jun 2018 01:09:08 -0700 (PDT) Received: by mail-wr0-x233.google.com with SMTP id a12-v6so1711539wro.1 for ; Wed, 13 Jun 2018 01:09:08 -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:in-reply-to:references; bh=Stm2acX9qh4MQfaImdjYghbtDsBG3KO7q9Fu4ANawX0=; b=Ug+dL0yZ+b36ZFMBh/XexL6Ekfs0SCBJGU3757tFGqNr9OGL2qMK5erCRMZTOF5yBS WlkxfQOpmEsI7GITzHAuVCaxy+MK/Vh2Brs6nvMJOwJX/1343NKOa5vOy7RHuz0fISmr 56QrZnCMIVKj090TyknFa/mmICVxcmlpHvn8g= 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=Stm2acX9qh4MQfaImdjYghbtDsBG3KO7q9Fu4ANawX0=; b=RRW55anbwSPQkxUM9l+JCJZdyYBPmPuAvS7nozETNlIBl3rktYnRqu+gKND3hec49A cyf0cAlc7L7a680FtrEz/n7rm1+BV6hFpywcOSSQX7EEd0qEG//oNV+W8dbyiJMbjmhj wlUeAGFTDfEo6y+TQm4Gv3CZghApdCj9ljZCsThQS7uz831NKpPRXP8gv97SpxZi3C25 Z+gCqz/Wb3Ce77jA71DQzfX/7SFOyMZFMrcp2LlZsV0/+cuOJomW6ktxrQURV3M2yA5k K2hUP4p2JBTHz2etMtCIho9T3+aonOBq6A5swryoaITqX7h1C4vvEOhOs/oNHbjrOfcw rD0A== X-Gm-Message-State: APt69E2z+nhktGaZTcOpH99WNDuqUX0mWQR4lcVvtOao4fXt69Gs+O45 czS6P7QbFaJMw/rSIfd2B0jJVZDMLls= X-Received: by 2002:adf:ea44:: with SMTP id j4-v6mr3327635wrn.224.1528877347174; Wed, 13 Jun 2018 01:09:07 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:6dfc:b76c:4240:35ff]) by smtp.gmail.com with ESMTPSA id v31-v6sm4974772wrc.80.2018.06.13.01.09.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:06 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 13 Jun 2018 10:08:59 +0200 Message-Id: <20180613080901.7156-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613080901.7156-1-ard.biesheuvel@linaro.org> References: <20180613080901.7156-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v4 2/4] MdeModulePkg/DxeCapsuleLibFmp: pass progress callback only if it works X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.d.kinney@intel.com, jiewen.yao@intel.com, star.zeng@intel.com, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" If the first call to UpdateImageProgress() fails, there is no point in passing a pointer to it to Fmp->SetImage(), since it is highly unlikely to succeed on any subsequent calls. This permits the FMP implementation to fall back to an alternate means of providing feedback to the user, e.g., via the console. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Star Zeng Signed-off-by: Ard Biesheuvel diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c index f0226eafa576..ab41df0eb0a4 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c @@ -841,6 +841,7 @@ SetFmpImageData ( UINT8 *Image; VOID *VendorCode; CHAR16 *AbortReason; + EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS ProgressCallback; Status = gBS->HandleProtocol( Handle, @@ -892,7 +893,11 @@ SetFmpImageData ( // // Before calling SetImage(), reset the progress bar to 0% // - UpdateImageProgress (0); + ProgressCallback = UpdateImageProgress; + Status = UpdateImageProgress (0); + if (EFI_ERROR (Status)) { + ProgressCallback = NULL; + } Status = Fmp->SetImage( Fmp, @@ -900,13 +905,15 @@ SetFmpImageData ( Image, // Image ImageHeader->UpdateImageSize, // ImageSize VendorCode, // VendorCode - UpdateImageProgress, // Progress + ProgressCallback, // Progress &AbortReason // AbortReason ); // // Set the progress bar to 100% after returning from SetImage() // - UpdateImageProgress (100); + if (ProgressCallback != NULL) { + UpdateImageProgress (100); + } DEBUG((DEBUG_INFO, "Fmp->SetImage - %r\n", Status)); if (AbortReason != NULL) { From patchwork Wed Jun 13 08:09:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138426 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp401637lji; Wed, 13 Jun 2018 01:09:14 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIIAyhfnT1vjOh/Fky2j0kQwcgiK0aHPE1m0ZoiBgwVScvduHYTWbbN8X3G8pQ8qS+QFLSb X-Received: by 2002:a62:9385:: with SMTP id r5-v6mr3850891pfk.59.1528877354246; Wed, 13 Jun 2018 01:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528877354; cv=none; d=google.com; s=arc-20160816; b=f08PNRxMNbJaLQ+F01j76UYD1KIOW3juB4USqYqrjGc7qBR+9sryi8aGn+sKnwV1L2 N5cow5ctUxhbzwjPNyuxdLrkoej1hUJ0w1WdlaaYIqmPlrJwq2IRhEIiyeUJdDkx9ecY Vgs2WgcCRhm0IjrHL3oNaFZW/Ru5Dy0aZ0vQ+EmgNu1kKvmLP6MgMa+f6rgBlzx4YtJJ Uc7p7MVmnwNjl0PJoTrXZG+umcV3ugOWYpP6+PR1WQNbuJC3p9r1ja851jaRbMZkqYju ze2AvzzOe9twjdeaNtDooBVo/pBSo6j/xd9rMt2nJfuzfnsgtDwz9FrXL7/yEZlZZJnC eFSA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=f5Q8px9BfMeFPurGCwdCKI2lRplK0Anzvx42Z/p/UR8=; b=b8MRfckoNw+JnK6BcVFDeI9qUVwU0vKdveYQBlwBcrOw/cnfUrCs+LFygCsgDEZUxB sqYylojyw4LoNsjHFrjTmYuOELKlm7DFXZWLFy8kIYgXhRvr7c25u9Z8uYn//sLIPAm9 CIexXwjt5NTu8nUK0TkzchyGU9avf4V3hArYbVpIMM/uwMjvJWeoRuDWeosRtzp9P9yu cGZI4C1MyBWGWvRjPHBvsNOUpuCuogJsdD994yfw0ccSSIhkN72C49Cl6eu4ersl6AWk xL48UqXj8EZyT1jSM6MSs6smLNkfRsjfSLQ1zdu/CsXBNRHt+VdXV9SDXQ28fi4R5+wW S0Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="R1/4kLtC"; 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 e9-v6si2556315pli.337.2018.06.13.01.09.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:14 -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.s=google header.b="R1/4kLtC"; 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 11B9E211E00E2; Wed, 13 Jun 2018 01:09:12 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::22a; helo=mail-wm0-x22a.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (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 1D48A212B2044 for ; Wed, 13 Jun 2018 01:09:10 -0700 (PDT) Received: by mail-wm0-x22a.google.com with SMTP id 69-v6so3508309wmf.3 for ; Wed, 13 Jun 2018 01:09:09 -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:in-reply-to:references; bh=JT63QFPgYtr0j5Y8WsamKwRIbdFZ0yqVXiPg+8FlRH0=; b=R1/4kLtCWmblbe4UozrBv1LZJ7aueJvaAnQZdoPEiypdKC3HgxLnfISpckks/H9Tuz dmdZW5371cnsCDNUfGEArTHOA8/A+o2vMF7NxuWdc0H3mCteMHzvW8qNYoBMZOgxv7wE cMgC8MhgkSnNqM8HNPEcnvUobJookpig6rqtA= 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=JT63QFPgYtr0j5Y8WsamKwRIbdFZ0yqVXiPg+8FlRH0=; b=L+BDslTOQEB5F8U4hSWYBn9REAlcypQ8M1KmlqdKg6SJRCMUNaNOKhb22iJlJwf1so LuSKq0yAmc/Q9K8vS16I0N4koDOSL+5WNnmuVjjwoHegal1EXdPEi1XoylVPZIRkWWCU ABD+1+3nM1eX8Ay+RAmtVR5uAQ2xTLGR5uA+PMrOBL75ah6eR14gRVUGR/mjUNYg09re q9/PSFiTIw1Hkb5G2EQjCuWuL0bJL9cswmJxe7ylbZk/dQq3OOv/DX4Z1v2QbVLadLbl +8N2keF8/NoxerOAReERR6uoFw9UEn6ilo+DJ/8chO6IaIX0A5zJZYgWdmx+rOk76Ia4 71kA== X-Gm-Message-State: APt69E0xoNfF/IYCzRQFHCeNym95lXxf9RtOWUgfYo82WP1bEn9w/UcR Yx554/Xwb+TwCn4WvL5lYgMpgHop8OY= X-Received: by 2002:a1c:954d:: with SMTP id x74-v6mr2848646wmd.57.1528877348406; Wed, 13 Jun 2018 01:09:08 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:6dfc:b76c:4240:35ff]) by smtp.gmail.com with ESMTPSA id v31-v6sm4974772wrc.80.2018.06.13.01.09.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:07 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 13 Jun 2018 10:09:00 +0200 Message-Id: <20180613080901.7156-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613080901.7156-1-ard.biesheuvel@linaro.org> References: <20180613080901.7156-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v4 3/4] ArmPkg/PlatformBootManagerLib: call ProcessCapsules() only once X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.d.kinney@intel.com, jiewen.yao@intel.com, star.zeng@intel.com, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" ARM platforms have no restriction on when a system firmware update capsule can be applied, and so it is not necessary to call ProcessCapsules() twice. So let's drop the first invocation that occurs before EndOfDxe, and rewrite the second call so that all capsule updates will be applied when the console is up and able to provide progress feedback. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 86 ++++++++++++++------ ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 + 2 files changed, 60 insertions(+), 27 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index 3456a71fbb9c..079f1552d5ea 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -553,21 +554,6 @@ PlatformBootManagerBeforeConsole ( VOID ) { - EFI_STATUS Status; - ESRT_MANAGEMENT_PROTOCOL *EsrtManagement; - - if (GetBootModeHob() == BOOT_ON_FLASH_UPDATE) { - DEBUG ((DEBUG_INFO, "ProcessCapsules Before EndOfDxe ......\n")); - Status = ProcessCapsules (); - DEBUG ((DEBUG_INFO, "ProcessCapsules returned %r\n", Status)); - } else { - Status = gBS->LocateProtocol (&gEsrtManagementProtocolGuid, NULL, - (VOID **)&EsrtManagement); - if (!EFI_ERROR (Status)) { - EsrtManagement->SyncEsrtFmp (); - } - } - // // Signal EndOfDxe PI Event // @@ -618,6 +604,56 @@ PlatformBootManagerBeforeConsole ( PlatformRegisterOptionsAndKeys (); } +STATIC +VOID +HandleCapsules ( + VOID + ) +{ + ESRT_MANAGEMENT_PROTOCOL *EsrtManagement; + EFI_PEI_HOB_POINTERS HobPointer; + EFI_CAPSULE_HEADER *CapsuleHeader; + BOOLEAN NeedReset; + EFI_STATUS Status; + + DEBUG ((DEBUG_INFO, "%a: processing capsules ...\n", __FUNCTION__)); + + Status = gBS->LocateProtocol (&gEsrtManagementProtocolGuid, NULL, + (VOID **)&EsrtManagement); + if (!EFI_ERROR (Status)) { + EsrtManagement->SyncEsrtFmp (); + } + + // + // Find all capsule images from hob + // + HobPointer.Raw = GetHobList (); + NeedReset = FALSE; + while ((HobPointer.Raw = GetNextHob (EFI_HOB_TYPE_UEFI_CAPSULE, + HobPointer.Raw)) != NULL) { + CapsuleHeader = (VOID *)(UINTN)HobPointer.Capsule->BaseAddress; + + Status = ProcessCapsuleImage (CapsuleHeader); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: failed to process capsule %p - %r\n", + __FUNCTION__, CapsuleHeader, Status)); + return; + } + + NeedReset = TRUE; + HobPointer.Raw = GET_NEXT_HOB (HobPointer); + } + + if (NeedReset) { + DEBUG ((DEBUG_WARN, "%a: capsule update successful, resetting ...\n", + __FUNCTION__)); + + gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL); + CpuDeadLoop(); + } +} + + #define VERSION_STRING_PREFIX L"Tianocore/EDK2 firmware version " /** @@ -637,7 +673,6 @@ PlatformBootManagerAfterConsole ( VOID ) { - ESRT_MANAGEMENT_PROTOCOL *EsrtManagement; EFI_STATUS Status; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; UINTN FirmwareVerLength; @@ -675,17 +710,14 @@ PlatformBootManagerAfterConsole ( // EfiBootManagerConnectAll (); - Status = gBS->LocateProtocol (&gEsrtManagementProtocolGuid, NULL, - (VOID **)&EsrtManagement); - if (!EFI_ERROR (Status)) { - EsrtManagement->SyncEsrtFmp (); - } - - if (GetBootModeHob() == BOOT_ON_FLASH_UPDATE) { - DEBUG((DEBUG_INFO, "ProcessCapsules After EndOfDxe ......\n")); - Status = ProcessCapsules (); - DEBUG((DEBUG_INFO, "ProcessCapsules returned %r\n", Status)); - } + // + // On ARM, there is currently no reason to use the phased capsule + // update approach where some capsules are dispatched before EndOfDxe + // and some are dispatched after. So just handle all capsules here, + // when the console is up and we can actually give the user some + // feedback about what is going on. + // + HandleCapsules (); // // Enumerate all possible boot options. diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index e8cbb10dabdd..28d606d5c329 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -55,6 +55,7 @@ [LibraryClasses] UefiBootManagerLib UefiBootServicesTableLib UefiLib + UefiRuntimeServicesTableLib [FeaturePcd] gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport From patchwork Wed Jun 13 08:09:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138427 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp401692lji; Wed, 13 Jun 2018 01:09:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIczualkBIMQlBQuEtsdYNbqJCrWDtY5SZ5EvrMtv1CBPuKR9ZyLxFG7IOSKec4OLr72QoW X-Received: by 2002:a17:902:6b84:: with SMTP id p4-v6mr4070479plk.272.1528877356911; Wed, 13 Jun 2018 01:09:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528877356; cv=none; d=google.com; s=arc-20160816; b=H1ikkttMq86VsAoBjcPNC2PooOVRdRPaRZpYvOioMkyigpaFi+pBtqFl0eF4xnycOQ J5NQhnKqn66noWiWg2UJVqOnf7pf5Bgq+cdlj4vNnjwmyAwaKYX+Ns1FI5kj9fZJnzps puOdvMqyT88x0XZSZez0SX37zbRMxyls/PTVz02YH01Shnq+z+JAI739Z+9ozmYVE3Tr gYvlRK0PrF45fjgTPTp41DTO+mNM/lkOH53jswJkPPVlFwwBU4Nko8eugzP/uYnDI5fj KOl7AoZ2CA23fs9FecwEKbcjJj5tGgcOe/RzimgxHSXvv2VpkoI1x6MYa0kygLqMZA0Q ECtw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=1gkKPswNFz16Zyl9l0pqUfBUHG6IEHIp5SvnLZOi4dE=; b=hcJtx33ndspDzMbfjX1M1z+QIRQxEUZcFLOVsZAErGUEt4dl8FY0N6H6ofhDuRGYjs IZWLwrBG9kdE02z9G2Y4AdzNgbcYf1x2C9zWabo7iRuCT67HvimK6ibAUCgsjlZOafz7 f5lp0wEE2a/dZK6wsjIhPDifcWyS6hW5AOi28Ic/olk6Wz5o9eweS4pnXpxjs3yL0LVZ Ru6pVhWiwAa2AINqjGBnCqg6X8QKj7H0C8JKfu+KABsg8Wd8gqk1hyUcyYqFDsP9L7PC PtVIG+1qHh+VToj+fIXobs0xloGc0WBCZjpL8e2XvJE8y6clUr7a7N6Iy2PPoN86ryEf rBgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WnQY6d3W; 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 p18-v6si1807126pgu.671.2018.06.13.01.09.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:16 -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.s=google header.b=WnQY6d3W; 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 3C497211E00ED; Wed, 13 Jun 2018 01:09:13 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::231; helo=mail-wr0-x231.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x231.google.com (mail-wr0-x231.google.com [IPv6:2a00:1450:400c:c0c::231]) (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 95BE4226612DB for ; Wed, 13 Jun 2018 01:09:11 -0700 (PDT) Received: by mail-wr0-x231.google.com with SMTP id e18-v6so1694218wrs.5 for ; Wed, 13 Jun 2018 01:09:11 -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:in-reply-to:references; bh=MymDKa3gGQke6glFvCyLm6c+eSZPG5i3Z0yqNFbX1mQ=; b=WnQY6d3WwPUpywe34aMhhtqzO16I3L1jiYUtBzGyNTkyqOjuM5WnrkIjBNif0uvTT8 +0ITMy7eCPCzbiRvckCZav2uhwt6+m5V7js5ZLkpoqHJI8QBJpZW64apzXPRH4otp+g9 jh//p0ZWCwKKawPXtxV+35/CIqkudds23uLBw= 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=MymDKa3gGQke6glFvCyLm6c+eSZPG5i3Z0yqNFbX1mQ=; b=plfheYWopjQNddWzSKvgXOyY0H6B6fw5Ho9RmJ9QbqIFSwAPcAyVLh1xWDDQfi2/H9 ACdek0szGEwNXQOeBNKdtGuPg2mSy98xJsRu4AR4+NMp9xRiUqgl6Os+zqdgSKCQlu6P +ueIN4X6AkhunthQ70xBoPpNXnTPu3rZZnWDsxPCUuk2+qFbXWy2M4qYqvWMrTqa2NGQ q+deknDSVsBNlD5tG21u446B42AAJFccyGR/illo9uw7tqzMRFUgK9DGdtiCHC9qiLb1 KiVxVvj0j0hbvMRGmNulFs5zqNzbld4sPmvM82sbOyL7kaiDhgiZsjXzDIIcaihxWgwW ghfw== X-Gm-Message-State: APt69E06WqA4+xR4UYsLvW19diFdOp2orr0cmbM6CjXOfndInDtTRqrl zNkrnkt+nhY04osYc4yj6H692H5yWaA= X-Received: by 2002:adf:b219:: with SMTP id u25-v6mr3333193wra.1.1528877349893; Wed, 13 Jun 2018 01:09:09 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:6dfc:b76c:4240:35ff]) by smtp.gmail.com with ESMTPSA id v31-v6sm4974772wrc.80.2018.06.13.01.09.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 01:09:08 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 13 Jun 2018 10:09:01 +0200 Message-Id: <20180613080901.7156-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613080901.7156-1-ard.biesheuvel@linaro.org> References: <20180613080901.7156-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v4 4/4] ArmPkg/ArmSmcPsciResetSystemLib: implement fallback for warm reboot X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.d.kinney@intel.com, jiewen.yao@intel.com, star.zeng@intel.com, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Implement ResetSystemLib's EnterS3WithImmediateWake() routine using a jump back to the PEI entry point with interrupts and MMU+caches disabled. This is only possible at boot time, when we are sure that the current CPU is the only one up and running. Also, it depends on the platform whether the PEI code is preserved in memory (it may be copied to DRAM rather than execute in place), so also add a feature PCD to selectively enable this feature. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- ArmPkg/ArmPkg.dec | 4 ++++ ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c | 21 ++++++++++++++++++-- ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 9 +++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index debe066b6f7b..3aa229fe2ec9 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -85,6 +85,10 @@ [PcdsFeatureFlag.common] # Define if the GICv3 controller should use the GICv2 legacy gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|FALSE|BOOLEAN|0x00000042 + # Whether to implement warm reboot for capsule update using a jump back to the + # PEI entry point with caches and interrupts disabled. + gArmTokenSpaceGuid.PcdArmReenterPeiForCapsuleWarmReboot|FALSE|BOOLEAN|0x0000001F + [PcdsFeatureFlag.ARM] # Whether to map normal memory as non-shareable. FALSE is the safe choice, but # TRUE may be appropriate to fix performance problems if you don't care about diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c index d6d26bce5009..10ceafd14d5d 100644 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c @@ -15,10 +15,13 @@ #include +#include +#include #include #include #include -#include +#include +#include #include @@ -89,7 +92,21 @@ EnterS3WithImmediateWake ( VOID ) { - // Not implemented + VOID (*Reset)(VOID); + + if (FeaturePcdGet (PcdArmReenterPeiForCapsuleWarmReboot) && + !EfiAtRuntime ()) { + // + // At boot time, we are the only core running, so we can implement the + // immediate wake (which is used by capsule update) by disabling the MMU + // and interrupts, and jumping to the PEI entry point. + // + Reset = (VOID (*)(VOID))(UINTN)FixedPcdGet64 (PcdFvBaseAddress); + + gBS->RaiseTPL (TPL_HIGH_LEVEL); + ArmDisableMmu (); + Reset (); + } } /** diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf index 5a1ee976e5bc..19021cd1e8b6 100644 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf @@ -30,6 +30,15 @@ [Packages] MdePkg/MdePkg.dec [LibraryClasses] + ArmMmuLib ArmSmcLib BaseLib DebugLib + UefiBootServicesTableLib + UefiRuntimeLib + +[FeaturePcd] + gArmTokenSpaceGuid.PcdArmReenterPeiForCapsuleWarmReboot + +[FixedPcd] + gArmTokenSpaceGuid.PcdFvBaseAddress