From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web09.3482.1578388944179527884 for ; Tue, 07 Jan 2020 01:22:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=UlM/TYdx; spf=pass (domain: linaro.org, ip: 209.85.221.68, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f68.google.com with SMTP id b6so53110193wrq.0 for ; Tue, 07 Jan 2020 01:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+1CVar6CM5A7m1beRWMksg0Kbtgo0HtnK3XXehWGfzo=; b=UlM/TYdxJ+AI6UFdnl2xgCrzUyKr47/HTutwiqsc6QUsa92g3yak/z9JiEQKo3Tg2/ ePDQa8ne0efepdQHv7KSz0EtNbrqzQ2tTKFoFr4HtWW2J4iruq5oh8f3NGxwB7ycr5aC IW6OhVE2B60zZKUCOedPXrWSv10v43PhCDnKKaiD7SLcnE+6Lz8g+R+mKt7GCKAyap6d 0KK9YNmgfFhTBHBOzw6JDgfpXenNkOQubK33vvFnWvOqCmHbfPJ0Dv4AeO96y090OGYC fBw4Xx9p4W3d/KrhPFBKYtGUzGc2nUnzetMz82ylJB1EhjYAr0KIdvuzKG5BtkY49cFQ PHoA== 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:mime-version:content-transfer-encoding; bh=+1CVar6CM5A7m1beRWMksg0Kbtgo0HtnK3XXehWGfzo=; b=khvJGeC2QqNlfBGax1SjYlsapkGpYP9EBv21s9PmJwKuGkGfaqD3/INpIeuLCapyAy o2RayqFlwZPmdy96Jl2VFdDoEp4zC62a8EQK4t7hl6aWVdC/6TLH/GVHDNsIYkS79oe6 JucXZ+Bivq7LLRDDPQXBKbcdonmJjzj3jA3V1A9whjRu3a6lwpRT42lS3DgLrELGJknQ sG2GvFwFyvrT/6Pcj7087MrSzw9g1KQKDvqP9e4NQmvnhM/p5DXHTF0PC+/HHa9WXEJq qlIIUoQwFW4r47/NUA5FK7F0r5DvHGpyaArqGc+vLQD6QfMQJDWzDo/0PcxUvj1MDlRe RfHQ== X-Gm-Message-State: APjAAAXerPaHm787ol85KZevdIvD1/+l4BzeqgC1hklNcpDAwGBKE4Wy tTUFD9UQtWheg0IC42WNVaq96moXvDmYWw== X-Google-Smtp-Source: APXvYqynGnN9Lf5pcdcxrykdlhzhkfvlp1H6VediNC7TJqSFq1rspdOzIPCvU5GcNmkm53k4r7MVSA== X-Received: by 2002:a5d:55d1:: with SMTP id i17mr105360525wrw.165.1578388942212; Tue, 07 Jan 2020 01:22:22 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2a01:cb1d:112:6f00:cc7e:d2b6:8b0c:cb36]) by smtp.gmail.com with ESMTPSA id h66sm27445476wme.41.2020.01.07.01.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 01:22:20 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () Date: Tue, 7 Jan 2020 10:22:14 +0100 Message-Id: <20200107092215.3271-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107092215.3271-1-ard.biesheuvel@linaro.org> References: <20200107092215.3271-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit EnterS3WithImmediateWake () no longer has any callers, so remove it from ResetSystemLib. Note that this means the hack to support warm reboot by jumping to the SEC entry point with the MMU and caches off is also no longer used, and can be removed as well, along with the PCD PcdArmReenterPeiForCapsuleWarmReboot that was introduced for this purpose. Signed-off-by: Ard Biesheuvel --- ArmPkg/ArmPkg.dec | 4 -- ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 17 ----- ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c | 66 +------------------- ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.S | 24 ------- ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.asm | 29 --------- ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.S | 23 ------- ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.asm | 28 --------- 7 files changed, 2 insertions(+), 189 deletions(-) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 39ff339c956d..eaf1072d9ef3 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -78,10 +78,6 @@ [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.inf b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf index fa19bf649131..c17b28cfac79 100644 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf @@ -15,14 +15,6 @@ [Defines] VERSION_STRING = 1.0 LIBRARY_CLASS = ResetSystemLib -[Sources.AARCH64] - AArch64/Reset.S | GCC - AArch64/Reset.asm | MSFT - -[Sources.ARM] - Arm/Reset.S | GCC - Arm/Reset.asm | RVCT - [Sources] ArmSmcPsciResetSystemLib.c @@ -32,15 +24,6 @@ [Packages] MdePkg/MdePkg.dec [LibraryClasses] - ArmMmuLib ArmSmcLib BaseLib DebugLib - UefiBootServicesTableLib - UefiRuntimeLib - -[FeaturePcd] - gArmTokenSpaceGuid.PcdArmReenterPeiForCapsuleWarmReboot - -[FixedPcd] - gArmTokenSpaceGuid.PcdFvBaseAddress diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c index b2dde9bfc13a..22fcf989e903 100644 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c @@ -10,13 +10,10 @@ #include -#include -#include #include #include #include -#include -#include +#include #include @@ -76,8 +73,6 @@ ResetShutdown ( ArmCallSmc (&ArmSmcArgs); } -VOID DisableMmuAndReenterPei (VOID); - /** This function causes the system to enter S3 and then wake up immediately. @@ -89,64 +84,7 @@ EnterS3WithImmediateWake ( VOID ) { - EFI_PHYSICAL_ADDRESS Alloc; - EFI_MEMORY_DESCRIPTOR *MemMap; - UINTN MemMapSize; - UINTN MapKey, DescriptorSize; - UINT32 DescriptorVersion; - EFI_STATUS Status; - - 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. - // - - // - // Obtain the size of the memory map - // - MemMapSize = 0; - MemMap = NULL; - Status = gBS->GetMemoryMap (&MemMapSize, MemMap, &MapKey, &DescriptorSize, - &DescriptorVersion); - ASSERT (Status == EFI_BUFFER_TOO_SMALL); - - // - // Add some slack to the allocation to cater for changes in the memory - // map if ExitBootServices () fails the first time around. - // - MemMapSize += SIZE_4KB; - Status = gBS->AllocatePages (AllocateAnyPages, EfiBootServicesData, - EFI_SIZE_TO_PAGES (MemMapSize), &Alloc); - ASSERT_EFI_ERROR (Status); - - MemMap = (EFI_MEMORY_DESCRIPTOR *)(UINTN)Alloc; - - Status = gBS->GetMemoryMap (&MemMapSize, MemMap, &MapKey, &DescriptorSize, - &DescriptorVersion); - ASSERT_EFI_ERROR (Status); - - Status = gBS->ExitBootServices (gImageHandle, MapKey); - if (EFI_ERROR (Status)) { - // - // ExitBootServices () may fail the first time around if an event fired - // right after the call to GetMemoryMap() which allocated or freed memory. - // Since that first call to ExitBootServices () will disarm the timer, - // this is guaranteed not to happen again, so one additional attempt - // should suffice. - // - Status = gBS->GetMemoryMap (&MemMapSize, MemMap, &MapKey, &DescriptorSize, - &DescriptorVersion); - ASSERT_EFI_ERROR (Status); - - Status = gBS->ExitBootServices (gImageHandle, MapKey); - ASSERT_EFI_ERROR (Status); - } - - DisableMmuAndReenterPei (); - } + // Not implemented } /** diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.S b/ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.S deleted file mode 100644 index d0d908b7d70d..000000000000 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.S +++ /dev/null @@ -1,24 +0,0 @@ -/** @file - ResetSystemLib implementation using PSCI calls - - Copyright (c) 2018, Linaro Ltd. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include - -ASM_FUNC(DisableMmuAndReenterPei) - stp x29, x30, [sp, #-16]! - mov x29, sp - - bl ArmDisableMmu - - // no memory accesses after MMU and caches have been disabled - - MOV64 (x0, FixedPcdGet64 (PcdFvBaseAddress)) - blr x0 - - // never returns - nop diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.asm b/ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.asm deleted file mode 100644 index 752df072511b..000000000000 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.asm +++ /dev/null @@ -1,29 +0,0 @@ -;/** @file -; ResetSystemLib implementation using PSCI calls -; -; Copyright (c) 2018, Linaro Ltd. All rights reserved.
-; -; SPDX-License-Identifier: BSD-2-Clause-Patent -; -;**/ - - AREA Reset, CODE, READONLY - - EXPORT DisableMmuAndReenterPei - IMPORT ArmDisableMmu - -DisableMmuAndReenterPei - stp x29, x30, [sp, #-16]! - mov x29, sp - - bl ArmDisableMmu - - ; no memory accesses after MMU and caches have been disabled - - movl x0, FixedPcdGet64 (PcdFvBaseAddress) - blr x0 - - ; never returns - nop - - END diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.S b/ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.S deleted file mode 100644 index c0c5bcf19723..000000000000 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.S +++ /dev/null @@ -1,23 +0,0 @@ -/** @file - ResetSystemLib implementation using PSCI calls - - Copyright (c) 2018, Linaro Ltd. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include - -ASM_FUNC(DisableMmuAndReenterPei) - push {lr} - - bl ArmDisableMmu - - // no memory accesses after MMU and caches have been disabled - - MOV32 (r0, FixedPcdGet64 (PcdFvBaseAddress)) - blx r0 - - // never returns - nop diff --git a/ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.asm b/ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.asm deleted file mode 100644 index ab7519a5a926..000000000000 --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.asm +++ /dev/null @@ -1,28 +0,0 @@ -;/** @file -; ResetSystemLib implementation using PSCI calls -; -; Copyright (c) 2018, Linaro Ltd. All rights reserved.
-; -; SPDX-License-Identifier: BSD-2-Clause-Patent -; -;**/ - - INCLUDE AsmMacroExport.inc - PRESERVE8 - - IMPORT ArmDisableMmu - -RVCT_ASM_EXPORT DisableMmuAndReenterPei - push {lr} - - bl ArmDisableMmu - - ; no memory accesses after MMU and caches have been disabled - - mov32 r0, FixedPcdGet64 (PcdFvBaseAddress) - blx r0 - - ; never returns - nop - - END -- 2.20.1