From patchwork Tue Jun 12 11:23:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138319 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5218627lji; Tue, 12 Jun 2018 04:23:39 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKMxwMOBRJNs/HNvB0IIRdwVReKAp9KL1p7qfvgGthNyeGKI/wQ6wwtp+dVrG3F2COhXIhx X-Received: by 2002:a63:9e0a:: with SMTP id s10-v6mr2906066pgd.305.1528802619389; Tue, 12 Jun 2018 04:23:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528802619; cv=none; d=google.com; s=arc-20160816; b=CIMKpr48aNfiAot+BxePI6peEmTH42WpOOcS697lm2nFZzCAwuoBariFeoYmlVrYE+ u2O4vPXbsqaPo0yfmWeWcLzR1AUYt77MuYKERs1DivygkMdWoQMTB/I/8R86969Toagn cj3Or23amNiHjuS8cgaegLDaYVt494nZ38ss4/SFPRfN7FSwn3de70/CWZMPi6wxcULa aarwqnLYpUNTKkhWUz4AGuS/FFgDy5WCL4NG/DR/SjgyCctRsf9/1k1yyO/hQsCNWU3z GKHgBqd2W5Fjbn00xcr7anl40KgyaQb+Rhojjzd8+eZaIP5OPyKqzkPASvwAWKd6OsqB PTTA== 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=GPK9T+CGdRdKQZRE8P8t8dN5xcyiicy9FFinFYV0Ilc=; b=WMgDaSeiD/wbM+tin0Iiv6hbO3/3qcFSBaT4Wnzsh0q9K7fshUCuFaeUyUM83F8vrD TJAz9PxyB6bJZrF5uf3RX/nFaDUVPI+RXJRSXcq+Er4cohBG9ACQNQWMt59Z8oKmo2tA QdkHzN/H/QbtNQfE80WFWfNOOoIYMtxq+JzbEGmmBVyrpGtv5Ri7g8CIh30CdFTvze4p 3lrQ8bIm4SenfH9W2Wfj9wJWw4FY80xyNSWW8WLUBG/kjWM0RtedxYX34fTCCo/oQSkx fM5TNpb8loZ4GHA93pLIqXej+sAcsaNhorm6K2DH2PSm3mzVkSvZs6LIPkO1l4ZQ8f7r SxHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WfHBMsld; 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 t8-v6si572761pgq.369.2018.06.12.04.23.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 04:23:39 -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=WfHBMsld; 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 0FAE62121796A; Tue, 12 Jun 2018 04:23:38 -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::241; helo=mail-wm0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (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 E1A3821217948 for ; Tue, 12 Jun 2018 04:23:36 -0700 (PDT) Received: by mail-wm0-x241.google.com with SMTP id 69-v6so22530092wmf.3 for ; Tue, 12 Jun 2018 04:23:36 -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=uThG1A0rfE/YeQ4x29WlPWvhi7jqx/S3kiLBnZwJZNI=; b=WfHBMsld50Pt/wGEQEhr9uvJLoSR11XPdimVEcpi1IFgJ9llWO6QJgdbQUN3sbMCmQ DSlQY+XobaaxyFD6AX5oNeoP0UtMDql6rfBqGpM2Xq3BAqhvM5fn3YiVpmKLYsfN0fAf IoDeagLGfbrHzscZe5LkyGLU1ECLpXaGF4tS0= 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=uThG1A0rfE/YeQ4x29WlPWvhi7jqx/S3kiLBnZwJZNI=; b=nDz7jDiDteKe6f3ykBso4Md+BrVTIarHON2T1pF5K0mYGU3eruSzyM6frNd42+SF/H 8COsRhvIhlI+c5vhMqF+FrPWKxvEGTFk6Iw8bVC8X+YGh0U+n+O6XBRdwiccy8eKt0rJ indkhVP5uvbflsVkQQynlRaaMNG0kwrnPlzope3rMWhBkgyLAG+PqfhXa1B2yD9MXLgt uwj/FUurvZ98ph0XDX/QpKjfJzZBghf3VtnMGDuxcNP/QZ7zHSWZViSvP6EeDuhowdHk qovKMDm36/7YqLu4cX1zX/e6DxSWOSVs9Bmiabd0lDgU+n8D3Zokrh8wVCRAJhxcXKD9 kkPw== X-Gm-Message-State: APt69E2GP3dQteeveYQs/0KQXgjLtN/E+y4hVxym0RheNZ7N1CF+fzSW DyYTk4QIH+31f4ern8OE7EGo3g+RsW0= X-Received: by 2002:a1c:aa12:: with SMTP id t18-v6mr1778608wme.54.1528802614974; Tue, 12 Jun 2018 04:23:34 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:3c84:18ae:27f2:d03]) by smtp.gmail.com with ESMTPSA id o16-v6sm1177202wrp.8.2018.06.12.04.23.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 04:23:34 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 12 Jun 2018 13:23:26 +0200 Message-Id: <20180612112329.664-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612112329.664-1-ard.biesheuvel@linaro.org> References: <20180612112329.664-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v3 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/CacheMaintenance.c | 70 ++++++++++++++++++++ MdeModulePkg/Universal/CapsuleRuntimeDxe/CacheMaintenance.c | 39 +++++++++++ MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf | 13 +++- MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c | 24 +++++++ 4 files changed, 144 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/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CacheMaintenance.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CacheMaintenance.c new file mode 100644 index 000000000000..dc05e345fb8d --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/Arm/CacheMaintenance.c @@ -0,0 +1,70 @@ + /** @file + Capsule cache maintenance as is required on ARM and AARCH64 + + 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 + +/** + 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 + + @return EFI_SUCCESS if the operation succeeded. + EFI_UNSUPPORTED if cache maintenance cannot be performed at this + time. + +**/ +EFI_STATUS +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ) +{ + EFI_CAPSULE_BLOCK_DESCRIPTOR *Desc; + + // + // 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. + // + if (EfiAtRuntime ()) { + return EFI_UNSUPPORTED; + } + + 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); + + return EFI_SUCCESS; +} diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CacheMaintenance.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CacheMaintenance.c new file mode 100644 index 000000000000..fb7504bb3e1d --- /dev/null +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CacheMaintenance.c @@ -0,0 +1,39 @@ +/** @file + Create NULL function for capsule cache maintenance which is only needed + on ARM and AARCH64 + + 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 + +/** + 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 + + @return EFI_SUCCESS if the operation succeeded. + EFI_UNSUPPORTED if cache maintenance cannot be performed at this + time. + +**/ +EFI_STATUS +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ) +{ + return EFI_SUCCESS; +} diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf index 9ab04ce1b301..3ceebc5d9646 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf @@ -27,17 +27,23 @@ [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 -[Sources.Ia32, Sources.IPF, Sources.EBC, Sources.ARM, Sources.AARCH64] +[Sources.Ia32, Sources.IPF, Sources.EBC] SaveLongModeContext.c + CacheMaintenance.c [Sources.X64] X64/SaveLongModeContext.c + CacheMaintenance.c + +[Sources.ARM, Sources.AARCH64] + SaveLongModeContext.c + Arm/CacheMaintenance.c [Packages] MdePkg/MdePkg.dec @@ -59,6 +65,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..ee8515adf62f 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c @@ -53,6 +53,25 @@ SaveLongModeContext ( 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 + + @return EFI_SUCCESS if the operation succeeded. + EFI_UNSUPPORTED if cache maintenance cannot be performed at this + time. + +**/ +EFI_STATUS +EFIAPI +CapsuleCacheWriteBack ( + IN EFI_PHYSICAL_ADDRESS ScatterGatherList + ); + /** 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 @@ -214,6 +233,11 @@ UpdateCapsule ( ); } + Status = CapsuleCacheWriteBack (ScatterGatherList); + if (EFI_ERROR (Status)) { + return Status; + } + // // ScatterGatherList is only referenced if the capsules are defined to persist across // system reset. Set its value into NV storage to let pre-boot driver to pick it up From patchwork Tue Jun 12 11:23:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138320 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5218672lji; Tue, 12 Jun 2018 04:23:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJVCFF/QlcxJppC/oM08FVyHWewzQIHayikIVUwO0rRhLyFwyL/LLC/D+iHQWqcY7/7mmde X-Received: by 2002:a65:4cc3:: with SMTP id n3-v6mr2854418pgt.98.1528802622314; Tue, 12 Jun 2018 04:23:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528802622; cv=none; d=google.com; s=arc-20160816; b=omq9E3RoTOQs5OhYqLNROTD3V+qMzQcJkyA+9JsIsC2i+6fmq46Dj9FsszcApM+M3p k6a5rkd/4fHTUc9bQrmwnkvrB+v0AXO3wgq897GxROuocXa5s3WnbH+TRSJ1l9tNCFSe 4mIH0BrtY/EP+ZymwUPpw5ne9xWumfKB9NgUoW/ehB2rPNtRCVjSBFmuCkctGWuJN/Im g7yqd2zF0IjpOzrMaEaU9kJkYUMtF82JkPmvzXfZDIgS4OPbS5UsbjJTfp+ISWKKn2DB wkjHPCF/sTbnLTPj7PnJHgKNTHL9z427fJ72MYezdYUIxNQqW4JRWAzQo42V4M0IKGnj 8boA== 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=sXeVmQQ0Yl8q0c3aM3Bx3Upsx937LYl/Z+ADt0leYvm+sdsTzK8c1EjDasqISnwMqK yewIgf1bkanxM4qKTOFJEPUqIo9lBCLeLbDZcOX0CULjFEf8I9ZOQJ01xGafMmSkvIa4 7dudESrxQEW9FP+Hz0ULJrCiYZUN4YLKEGnseM/raB7r0OIeeyr3l40qLR/P72/MJcaN KIk//Lhz0sGblqcs+GrABC32u56lFvjPtVRDVdKFvkzzHhtQilA9p2lmK9Q1ws60b4dN xhl/qmH1/9mvVb9tup9xtKXfYCeLw1ku2yJwIEXGsboY2KmIbyd2hEZtGLU3WL6lZdNB k30g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Aq7aEvsP; 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 z20-v6si690202pfl.209.2018.06.12.04.23.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 04:23:42 -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=Aq7aEvsP; 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 4104D2121797B; Tue, 12 Jun 2018 04:23:40 -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::22f; helo=mail-wm0-x22f.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (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 24BFB21217973 for ; Tue, 12 Jun 2018 04:23:38 -0700 (PDT) Received: by mail-wm0-x22f.google.com with SMTP id e16-v6so19894893wmd.0 for ; Tue, 12 Jun 2018 04:23:37 -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=Aq7aEvsPpVR9+6UAuMCP1QDR+saBw51Ciz7Ow97bVlBjcJywcfDNGMYUjF8cYZ+Mrd Uw5hxQPSAKGu84Hj08yMXa+OTew9T8H2sK6pIJ96rrHLUYrlfxdPqBAsSzwKNniYFdi8 Ui0xFFXr0huDGaXBGqnxJGwAbReNJEFIEh8qA= 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=NhTdNsoBayIvuTFHLfJadeYvKR/shgJWcRVfLq76Va0z11SdFsXW8iGZ4Ulwg5Faob v9KUBi93u51chI1xjyrOnRy4JV6tMbj+HYoJYpBi7nuy16h8ZQy9mKDhC15Ok3jXRuIw /NaffJV0G3TzLhZFcojBsHLMWB84Hfi+k3G/wlGsruHlUkt9xaM7esukMGpClF3nCujE zDLiRyVqASGHwnuVikBZQG3STTxtWbUVWsJ2KTSYilHMahxqOE2uXf2OBotIEhpDXqy+ VQL/KIjCFD9KkG8GApabW9op/J/nbccmoSaQmA8Uu3eD1iGfUBGWl3avoI/JVnBbJHoR KwNg== X-Gm-Message-State: APt69E2ZolCz2GIrMGl61T2rjRslmB1Cq3jMLbfk3aWxoCOZikEQdcl7 N8hAvirafGhg7mJfUn/AJQqj3Fqw3SI= X-Received: by 2002:a1c:7153:: with SMTP id m80-v6mr1759509wmc.7.1528802616372; Tue, 12 Jun 2018 04:23:36 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:3c84:18ae:27f2:d03]) by smtp.gmail.com with ESMTPSA id o16-v6sm1177202wrp.8.2018.06.12.04.23.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 04:23:35 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 12 Jun 2018 13:23:27 +0200 Message-Id: <20180612112329.664-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612112329.664-1-ard.biesheuvel@linaro.org> References: <20180612112329.664-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v3 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 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 Tue Jun 12 11:23:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138321 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5218736lji; Tue, 12 Jun 2018 04:23:45 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJn6gRRVbZEHg4dChP9M4VUUiEtNgiqYFS/attaFIn1WcMY05/wUflTkaV8vy+D/eAvfI+k X-Received: by 2002:a63:6dce:: with SMTP id i197-v6mr2906723pgc.215.1528802625171; Tue, 12 Jun 2018 04:23:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528802625; cv=none; d=google.com; s=arc-20160816; b=pfp+8shedAyM2QqFlRyJLnqsW8rHsdd2vNnyTAyI5CZ4EqgOyLLqwojt7h4+NChjfo oMxnBWL6ZKdSD60UBNMepp9n9XylTOE1kr7O3msW+kZ+HieDO/hs54UXt40USNHhSNd2 Sp4JxenAAkzK/59J5IqzF1ABPFub5zN71MY8fGaudXhK9n8De1le5qxNBxq2fxdnLmEW JKmFutnme/jKrd3Tom8BLH9TwxarwxyjRlZhLpJv9ZgCR+1SeG5mtorveR6YOHBsMCdr 2C/+IDLLFHIs7EExg5CWHpT7pympnIJbI2fQx48hXjc4Xj5klWVLEz6UyuIkS5lhbAm2 hdtA== 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=PZ/qnhcbUDWxRlJvr4b3aG6l3ZMzj3pSUZsv1vuFAWM=; b=DVUaSByfx1G95EYcI5X09BV2LEIMEii0af/DtgFUX1leV46WdN6Pn/SuzLC1NX/3ns /TIddsgfEu10bRYcgEHO5Q7vtUq/QDf4xiqw0m8NaNns8GGmGff9nEz5G6H2u9AfHNbn rcXtJXb3f9NRM6NFNDdOur9weV0s3g1cfzITMidkwkPgNAHI5uq0drXT4VWk7T8/0/Ph uQN5u2wwFHwG0dYFaSjUtS06K9YAdmeOgypTRRqF17WiiAsiZPVXCewEX73F55wvm0p+ 82NabmXYvZVRHL5eaGaMaFoG/f3BiLrnh0Aoh0Fm9gQz2FL0FUQ8xgY7+knRtERqM66R zqFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=g6mrRudr; 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 e1-v6si550978pgr.318.2018.06.12.04.23.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 04:23:45 -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=g6mrRudr; 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 748852121797A; Tue, 12 Jun 2018 04:23:42 -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::22f; helo=mail-wr0-x22f.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x22f.google.com (mail-wr0-x22f.google.com [IPv6:2a00:1450:400c:c0c::22f]) (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 F328821217979 for ; Tue, 12 Jun 2018 04:23:39 -0700 (PDT) Received: by mail-wr0-x22f.google.com with SMTP id a12-v6so23682890wro.1 for ; Tue, 12 Jun 2018 04:23:39 -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=SEto7WiKDYJFLF6OMrLPa2ANAWW1maQD4Qayn3WBfuo=; b=g6mrRudrB2et9KLnR7bg1T1C5hjquyCbtSO4g2hI8YP9GanhPuY20ih4UCtGkp+htW 7sAC2Jal2kJZwvGjouFDUcOX6KN+rBg/gbUv5aJhEb7+RUtECvZIELLJCfFKBC8hwBuW Exuz9K3TDSikq8MhRRirqd/EUYBoYHidDqlBk= 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=SEto7WiKDYJFLF6OMrLPa2ANAWW1maQD4Qayn3WBfuo=; b=rTaQL5sPZLfVttEx+W+InfJkKGk93faor7ioxyZCghYHbvwaVv+swAG+bPA7USrlMN 7jvkZHsipGTOn7fWfoDetwt4XnQ0HpLbqUn1lNOF4QFgBA/WJ7C2jC9xHOWmqHt9Bt5p lv+ovm91RZnSZ459FwgZzRTfSGze5VKjC5rRg+6q84jStUfwbd1N5JPnaoiUop+lNtfJ anpxYj+TiKl70AXjQwRezWb2R01Z3K+9CLXSPV/vTlRAKHPjh1CEp1y/PflbyH5H0i4+ 1Yeu6LJEeDx9bBuXxFY0NxX60fN1Lat+FNv8tGnK36qz5C1dWmrkdCuR2cSpTsHHco93 AV/A== X-Gm-Message-State: APt69E0CNxZYGs7RigrGMABOH5nqpSkjeK+SGze2LRbGcDeSsRjCOArw nagfrgDLgr563FjZ/NL9qpiyfEO4lPo= X-Received: by 2002:adf:a6ca:: with SMTP id t68-v6mr2251795wrc.215.1528802617687; Tue, 12 Jun 2018 04:23:37 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:3c84:18ae:27f2:d03]) by smtp.gmail.com with ESMTPSA id o16-v6sm1177202wrp.8.2018.06.12.04.23.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 04:23:36 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 12 Jun 2018 13:23:28 +0200 Message-Id: <20180612112329.664-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612112329.664-1-ard.biesheuvel@linaro.org> References: <20180612112329.664-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v3 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 --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 87 ++++++++++++++------ ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 + 2 files changed, 61 insertions(+), 27 deletions(-) -- 2.17.1 _______________________________________________ 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/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index 3456a71fbb9c..7c21cce5960b 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,57 @@ 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; + } + if ((CapsuleHeader->Flags & CAPSULE_FLAGS_INITIATE_RESET) != 0) { + 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 +674,6 @@ PlatformBootManagerAfterConsole ( VOID ) { - ESRT_MANAGEMENT_PROTOCOL *EsrtManagement; EFI_STATUS Status; EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; UINTN FirmwareVerLength; @@ -675,17 +711,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 Tue Jun 12 11:23:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 138322 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5218811lji; Tue, 12 Jun 2018 04:23:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKId9KGvNAqWCG/9pzsA5ywTGfAuHmoJX+E9dGk0V8LlBKIUjnfAZQAX+DUTO/OIrFXZ9DIw X-Received: by 2002:a17:902:9b92:: with SMTP id y18-v6mr3568357plp.57.1528802628575; Tue, 12 Jun 2018 04:23:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528802628; cv=none; d=google.com; s=arc-20160816; b=pvMRsR0kfgrm5cdRXiAt70ywQ+VElBLC1F7SPl97WrHDVdKxJLLtX8xpJBXc/h00u6 F/cnN0gJ3IhPp3H+seH5YkuG9V5SjshYZ3tzdg2/4mHwgDGdWo9meQTncCOO6CZ+wwv0 tYbmVM1JezRHRi7a+tthloi9ufWqw1GGAWOJm83dS0FnSUeUwsBec5iTFfg7hKazR5qF 5UFK9aCEB5ag7KEiSIyVRXsQe+/Gi2wnVatfUi8Jjfh5zxprn5fPDZST5jIT2Q6Ma3kK /g9nDBz/J6gPFPU8uSRBhDbB4bZPXGQ5j83ctqode0X0hpnruwFMhoDnBEOrAuJn1TRW lJ1g== 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=jaXt6WoRGgekWazS+7V/b6UW62o3OFRsEFK7Nb5moy+CYJi3SSS58bWGAuRdSVnaha k7seLPmb6pAEo4rU62fZ56obBKLZgWwcZN8YeoMYu7nAB0wXOurrN3J2x/nZHVZolpYd KGSphjnExab3VR0QKFokXD23ZXbIE6aBiqRG76XB7mBBswBjvV0gfQl2E2l1i3mV4Kz/ lImO6uiS2v53oHy+3+NGFZwzp2GzkMI/TjPk8O1JhhfZwGtq6DHijh615V5eN86XoGKO +8paRm97SM97nkBlF6gC8+gnR6mebtGZR73bBy2br1ptXEIxfuMyJ9Sz9h5ZMH0gxBir nEkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=MIMT41tX; 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 d24-v6si692863plr.302.2018.06.12.04.23.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 04:23:48 -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=MIMT41tX; 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 9EBC821219AC5; Tue, 12 Jun 2018 04:23:42 -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::230; helo=mail-wr0-x230.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x230.google.com (mail-wr0-x230.google.com [IPv6:2a00:1450:400c:c0c::230]) (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 BA1AA21217973 for ; Tue, 12 Jun 2018 04:23:40 -0700 (PDT) Received: by mail-wr0-x230.google.com with SMTP id a12-v6so23682942wro.1 for ; Tue, 12 Jun 2018 04:23:40 -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=MIMT41tXqv5ZnmhFwkPLU4brhN3zljj3MNA0VRg1+mBaF4tqLe2RrZm0+fHelY2XwM xvA3I5xeT7Tx+elM0AZar2UTkVBJsKs9N8JZ6dmw8LGvxMoh0YhfuhLcvO2/MakaH7q9 G9h7sv9Xqqqjw8/24JRlAP3oWW6H11UL4Wd8U= 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=Q5vxPnR/k9A+UbeQp6CdbGeNSF5IVH8e6UfFz8jKNbRVkkGjJTi9M2jtZlppOIbsXo pHh6NPIA69bL5VRFCBAcK2qUlBpGVTfgUtxOE7KmMX1BffrmQKe9iPQ7OmvM6pwp5p2a yaW8Ji5jfa1Frd9MTteAx1jwHglx5geNDSrjX8x0WJxTSUWBnnCU48qKRWpVfpMoVgg8 Ot3fv09U2SSD+HeNwJ6VviDz1CEa0xAaZ9c6REOhn8/rRpFaWIwkN6kcR9zMQLi9pl7q +oON4cB6jfmqZSVTTLVix/zuiu6n+QTmO2pTAWE2m56iaWaQHhGpy/28ZTPh+cNucvQ6 kpjQ== X-Gm-Message-State: APt69E2PHHrVtQDnuFS5EUnxX96N1Evh0zExeLJyRptpvCYhvFyEKp0X ICo5bDeOXO+ipbQvaHFn8pIbCPKkpoU= X-Received: by 2002:adf:c70e:: with SMTP id k14-v6mr2198126wrg.16.1528802618882; Tue, 12 Jun 2018 04:23:38 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:3c84:18ae:27f2:d03]) by smtp.gmail.com with ESMTPSA id o16-v6sm1177202wrp.8.2018.06.12.04.23.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 04:23:38 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 12 Jun 2018 13:23:29 +0200 Message-Id: <20180612112329.664-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612112329.664-1-ard.biesheuvel@linaro.org> References: <20180612112329.664-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v3 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