* [PATCH 0/2] some ARM fixes
@ 2020-01-07 9:22 Ard Biesheuvel
2020-01-07 9:22 ` [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () Ard Biesheuvel
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Ard Biesheuvel @ 2020-01-07 9:22 UTC (permalink / raw)
To: devel; +Cc: leif.lindholm, Ard Biesheuvel
Some preparatory fixes for TPM measured boot on ARM systems.
Patch #1 removes EnterS3WithImmediateWake() with the associated support
code from ArmSmcPsciResetSystemLib. EnterS3WithImmediateWake () is no
longer being called anywhere, and will be removed from ResetSystemLib,
and the support code dependencies on DXE facilities are preventing this
library from being used in the PEI phase, which is needed for TPM support.
Patch #2 adds the missing call to enable VFP on PrePeiCore based platforms.
This is causing TPM crypto code to blow up.
Ard Biesheuvel (2):
ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake ()
ArmPlatformPkg/PrePeiCore: enable VFP at startup
ArmPkg/ArmPkg.dec | 4 --
ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 17 -----
ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 1 +
ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 1 +
ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c | 66 +-------------------
ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 5 ++
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 ---------
10 files changed, 9 insertions(+), 189 deletions(-)
delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.S
delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.asm
delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.S
delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.asm
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () 2020-01-07 9:22 [PATCH 0/2] some ARM fixes Ard Biesheuvel @ 2020-01-07 9:22 ` Ard Biesheuvel 2020-01-14 17:18 ` Leif Lindholm 2020-01-07 9:22 ` [PATCH 2/2] ArmPlatformPkg/PrePeiCore: enable VFP at startup Ard Biesheuvel 2020-01-14 16:43 ` [PATCH 0/2] some ARM fixes Ard Biesheuvel 2 siblings, 1 reply; 8+ messages in thread From: Ard Biesheuvel @ 2020-01-07 9:22 UTC (permalink / raw) To: devel; +Cc: leif.lindholm, Ard Biesheuvel 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 <ard.biesheuvel@linaro.org> --- 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 <PiDxe.h> -#include <Library/ArmMmuLib.h> -#include <Library/ArmSmcLib.h> #include <Library/BaseLib.h> #include <Library/DebugLib.h> #include <Library/ResetSystemLib.h> -#include <Library/UefiBootServicesTableLib.h> -#include <Library/UefiRuntimeLib.h> +#include <Library/ArmSmcLib.h> #include <IndustryStandard/ArmStdSmc.h> @@ -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.<BR> - - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include <AsmMacroIoLibV8.h> - -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.<BR> -; -; 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.<BR> - - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include <AsmMacroIoLib.h> - -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.<BR> -; -; 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 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () 2020-01-07 9:22 ` [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () Ard Biesheuvel @ 2020-01-14 17:18 ` Leif Lindholm 2020-01-14 17:42 ` Ard Biesheuvel 0 siblings, 1 reply; 8+ messages in thread From: Leif Lindholm @ 2020-01-14 17:18 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: devel Apologies for late response - only just got email fully back up. Minor comment below. On Tue, Jan 07, 2020 at 10:22:14 +0100, Ard Biesheuvel wrote: > 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 <ard.biesheuvel@linaro.org> > --- > 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/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 <PiDxe.h> > > -#include <Library/ArmMmuLib.h> > -#include <Library/ArmSmcLib.h> > #include <Library/BaseLib.h> > #include <Library/DebugLib.h> > #include <Library/ResetSystemLib.h> > -#include <Library/UefiBootServicesTableLib.h> > -#include <Library/UefiRuntimeLib.h> > +#include <Library/ArmSmcLib.h> Why does ArmSmcLib.h move? If it is functionally required, then is there a bug in the file? If not, can it go back to its original spot? (If it can, and does, Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>) ((I will keep R-b:ing with that address until Maintainers.txt is updated.)) / Leif > > #include <IndustryStandard/ArmStdSmc.h> > > @@ -76,8 +73,6 @@ ResetShutdown ( > ArmCallSmc (&ArmSmcArgs); > } > > -VOID DisableMmuAndReenterPei (VOID); > - > /** > This function causes the system to enter S3 and then wake up immediately. > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () 2020-01-14 17:18 ` Leif Lindholm @ 2020-01-14 17:42 ` Ard Biesheuvel 0 siblings, 0 replies; 8+ messages in thread From: Ard Biesheuvel @ 2020-01-14 17:42 UTC (permalink / raw) To: Leif Lindholm; +Cc: edk2-devel-groups-io On Tue, 14 Jan 2020 at 18:18, Leif Lindholm <leif.lindholm@linaro.org> wrote: > > Apologies for late response - only just got email fully back up. > Minor comment below. > > On Tue, Jan 07, 2020 at 10:22:14 +0100, Ard Biesheuvel wrote: > > 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 <ard.biesheuvel@linaro.org> > > --- > > 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/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 <PiDxe.h> > > > > -#include <Library/ArmMmuLib.h> > > -#include <Library/ArmSmcLib.h> > > #include <Library/BaseLib.h> > > #include <Library/DebugLib.h> > > #include <Library/ResetSystemLib.h> > > -#include <Library/UefiBootServicesTableLib.h> > > -#include <Library/UefiRuntimeLib.h> > > +#include <Library/ArmSmcLib.h> > > Why does ArmSmcLib.h move? > If it is functionally required, then is there a bug in the file? > If not, can it go back to its original spot? > (If it can, and does, Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>) > I think that was a side effect of the revert. I'll put it back where it was. Thanks, > ((I will keep R-b:ing with that address until Maintainers.txt is > updated.)) > > / > Leif > > > > > #include <IndustryStandard/ArmStdSmc.h> > > > > @@ -76,8 +73,6 @@ ResetShutdown ( > > ArmCallSmc (&ArmSmcArgs); > > } > > > > -VOID DisableMmuAndReenterPei (VOID); > > - > > /** > > This function causes the system to enter S3 and then wake up immediately. > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] ArmPlatformPkg/PrePeiCore: enable VFP at startup 2020-01-07 9:22 [PATCH 0/2] some ARM fixes Ard Biesheuvel 2020-01-07 9:22 ` [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () Ard Biesheuvel @ 2020-01-07 9:22 ` Ard Biesheuvel 2020-01-14 17:33 ` Leif Lindholm 2020-01-14 16:43 ` [PATCH 0/2] some ARM fixes Ard Biesheuvel 2 siblings, 1 reply; 8+ messages in thread From: Ard Biesheuvel @ 2020-01-07 9:22 UTC (permalink / raw) To: devel; +Cc: leif.lindholm, Ard Biesheuvel While the alternative PEI-less SEC implementation in PrePi already takes the EnableVFP PCD into account, the PrePeiCore code does not, and so we may end up triggering synchronous exception when code attempts to use FP or SIMD registers, which is permitted by the spec. So enable the VFP as early as feasible. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 1 + ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 1 + ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf index f2ac45d171bc..104c7da53317 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf @@ -62,6 +62,7 @@ [FeaturePcd] [FixedPcd] gArmTokenSpaceGuid.PcdFvBaseAddress gArmTokenSpaceGuid.PcdFvSize + gArmTokenSpaceGuid.PcdVFPEnabled gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf index 84c319c3679b..ceb173d34f5d 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf @@ -60,6 +60,7 @@ [FeaturePcd] [FixedPcd] gArmTokenSpaceGuid.PcdFvBaseAddress gArmTokenSpaceGuid.PcdFvSize + gArmTokenSpaceGuid.PcdVFPEnabled gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c index 4911f67577a2..4f691d62cf3b 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c @@ -77,6 +77,11 @@ CEntryPoint ( ASSERT (((UINTN)PeiVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0); ArmWriteVBar ((UINTN)PeiVectorTable); + // Enable Floating Point + if (FixedPcdGet32 (PcdVFPEnabled)) { + ArmEnableVFP (); + } + //Note: The MMU will be enabled by MemoryPeim. Only the primary core will have the MMU on. // If not primary Jump to Secondary Main -- 2.20.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] ArmPlatformPkg/PrePeiCore: enable VFP at startup 2020-01-07 9:22 ` [PATCH 2/2] ArmPlatformPkg/PrePeiCore: enable VFP at startup Ard Biesheuvel @ 2020-01-14 17:33 ` Leif Lindholm 0 siblings, 0 replies; 8+ messages in thread From: Leif Lindholm @ 2020-01-14 17:33 UTC (permalink / raw) To: Ard Biesheuvel; +Cc: devel On Tue, Jan 07, 2020 at 10:22:15 +0100, Ard Biesheuvel wrote: > While the alternative PEI-less SEC implementation in PrePi already > takes the EnableVFP PCD into account, the PrePeiCore code does not, > and so we may end up triggering synchronous exception when code > attempts to use FP or SIMD registers, which is permitted by the spec. If you insert "on AARCH64" in an appropriate place in the above line: Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > > So enable the VFP as early as feasible. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 1 + > ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 1 + > ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 5 +++++ > 3 files changed, 7 insertions(+) > > diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf > index f2ac45d171bc..104c7da53317 100644 > --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf > +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf > @@ -62,6 +62,7 @@ [FeaturePcd] > [FixedPcd] > gArmTokenSpaceGuid.PcdFvBaseAddress > gArmTokenSpaceGuid.PcdFvSize > + gArmTokenSpaceGuid.PcdVFPEnabled > > gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase > gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize > diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf > index 84c319c3679b..ceb173d34f5d 100644 > --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf > +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf > @@ -60,6 +60,7 @@ [FeaturePcd] > [FixedPcd] > gArmTokenSpaceGuid.PcdFvBaseAddress > gArmTokenSpaceGuid.PcdFvSize > + gArmTokenSpaceGuid.PcdVFPEnabled > > gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase > gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize > diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c > index 4911f67577a2..4f691d62cf3b 100644 > --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c > +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c > @@ -77,6 +77,11 @@ CEntryPoint ( > ASSERT (((UINTN)PeiVectorTable & ARM_VECTOR_TABLE_ALIGNMENT) == 0); > ArmWriteVBar ((UINTN)PeiVectorTable); > > + // Enable Floating Point > + if (FixedPcdGet32 (PcdVFPEnabled)) { > + ArmEnableVFP (); > + } > + > //Note: The MMU will be enabled by MemoryPeim. Only the primary core will have the MMU on. > > // If not primary Jump to Secondary Main > -- > 2.20.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] some ARM fixes 2020-01-07 9:22 [PATCH 0/2] some ARM fixes Ard Biesheuvel 2020-01-07 9:22 ` [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () Ard Biesheuvel 2020-01-07 9:22 ` [PATCH 2/2] ArmPlatformPkg/PrePeiCore: enable VFP at startup Ard Biesheuvel @ 2020-01-14 16:43 ` Ard Biesheuvel 2020-01-14 22:15 ` Ard Biesheuvel 2 siblings, 1 reply; 8+ messages in thread From: Ard Biesheuvel @ 2020-01-14 16:43 UTC (permalink / raw) To: edk2-devel-groups-io, leif On Tue, 7 Jan 2020 at 10:22, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > > Some preparatory fixes for TPM measured boot on ARM systems. > > Patch #1 removes EnterS3WithImmediateWake() with the associated support > code from ArmSmcPsciResetSystemLib. EnterS3WithImmediateWake () is no > longer being called anywhere, and will be removed from ResetSystemLib, > and the support code dependencies on DXE facilities are preventing this > library from being used in the PEI phase, which is needed for TPM support. > > Patch #2 adds the missing call to enable VFP on PrePeiCore based platforms. > This is causing TPM crypto code to blow up. > > Ard Biesheuvel (2): > ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () > ArmPlatformPkg/PrePeiCore: enable VFP at startup > Ping? > ArmPkg/ArmPkg.dec | 4 -- > ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 17 ----- > ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 1 + > ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 1 + > ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c | 66 +------------------- > ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 5 ++ > 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 --------- > 10 files changed, 9 insertions(+), 189 deletions(-) > delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.S > delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.asm > delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.S > delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.asm > > -- > 2.20.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] some ARM fixes 2020-01-14 16:43 ` [PATCH 0/2] some ARM fixes Ard Biesheuvel @ 2020-01-14 22:15 ` Ard Biesheuvel 0 siblings, 0 replies; 8+ messages in thread From: Ard Biesheuvel @ 2020-01-14 22:15 UTC (permalink / raw) To: edk2-devel-groups-io, leif On Tue, 14 Jan 2020 at 17:43, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > > On Tue, 7 Jan 2020 at 10:22, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > > > > Some preparatory fixes for TPM measured boot on ARM systems. > > > > Patch #1 removes EnterS3WithImmediateWake() with the associated support > > code from ArmSmcPsciResetSystemLib. EnterS3WithImmediateWake () is no > > longer being called anywhere, and will be removed from ResetSystemLib, > > and the support code dependencies on DXE facilities are preventing this > > library from being used in the PEI phase, which is needed for TPM support. > > > > Patch #2 adds the missing call to enable VFP on PrePeiCore based platforms. > > This is causing TPM crypto code to blow up. > > > > Ard Biesheuvel (2): > > ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () > > ArmPlatformPkg/PrePeiCore: enable VFP at startup > > > > Ping? > Merged, thanks. > > > ArmPkg/ArmPkg.dec | 4 -- > > ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 17 ----- > > ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf | 1 + > > ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf | 1 + > > ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c | 66 +------------------- > > ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 5 ++ > > 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 --------- > > 10 files changed, 9 insertions(+), 189 deletions(-) > > delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.S > > delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.asm > > delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.S > > delete mode 100644 ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.asm > > > > -- > > 2.20.1 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-01-14 22:16 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-01-07 9:22 [PATCH 0/2] some ARM fixes Ard Biesheuvel 2020-01-07 9:22 ` [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () Ard Biesheuvel 2020-01-14 17:18 ` Leif Lindholm 2020-01-14 17:42 ` Ard Biesheuvel 2020-01-07 9:22 ` [PATCH 2/2] ArmPlatformPkg/PrePeiCore: enable VFP at startup Ard Biesheuvel 2020-01-14 17:33 ` Leif Lindholm 2020-01-14 16:43 ` [PATCH 0/2] some ARM fixes Ard Biesheuvel 2020-01-14 22:15 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox