[edk2-devel] [edk2][PATCH V3 1/1] ArmPlatformPkg/PrePeiCore: Explicitly invoke constructor for SEC phase

[Thomas Abraham]

On 06/07/2022 14:42, Rohit Mathew wrote:
> Invoke the constructor in the SEC phase to call into initialization
> functions associated with libraries linked with this particular module.
> For instance, PrePeiCore's CEntryPoint function calls DebugLib library's
> print API before the library is initialized.  This change is essential
> to initialize uart for SEC phase.
> 
> Signed-off-by: Rohit Mathew <rohit.mathew at arm.com>
> ---
>   ArmPlatformPkg/PrePeiCore/PrePeiCore.h | 11 ++++++++++-
>   ArmPlatformPkg/PrePeiCore/PrePeiCore.c |  6 +++++-
>   2 files changed, 15 insertions(+), 2 deletions(-)
> 
> Changes since V1:
> - Rebased on top of latest master branch.
> - Addressed comments from Ard.
> 
> Changes since V2:
> - Rebased on top of latest master branch.
> 
> Link to github branch for the patch -
> https://github.com/rohit-arm/edk2/tree/sec_constructor_issue
> 
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> index 0345dd7bdd2a..b752c4b9e617 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
> @@ -1,7 +1,7 @@
>   /** @file
>     Main file supporting the transition to PEI Core in Normal World for Versatile Express
>   
> -  Copyright (c) 2011, ARM Limited. All rights reserved.
> +  Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
>   
>     SPDX-License-Identifier: BSD-2-Clause-Patent
>   
> @@ -73,4 +73,13 @@ PeiCommonExceptionEntry (
>     IN UINTN   LR
>     );
>   
> +/*
> + * Constructor for SEC phase
> + */
> +VOID
> +EFIAPI
> +ProcessLibraryConstructorList (
> +  VOID
> +  );
> +
>   #endif
> diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
> index 6dd9bcdea24f..9654866f0c13 100644
> --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
> +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c
> @@ -1,7 +1,7 @@
>   /** @file
>     Main file supporting the transition to PEI Core in Normal World for Versatile Express
>   
> -  Copyright (c) 2011-2014, ARM Limited. All rights reserved.
> +  Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.
>   
>     SPDX-License-Identifier: BSD-2-Clause-Patent
>   
> @@ -86,6 +86,10 @@ CEntryPoint (
>       ArmEnableVFP ();
>     }
>   
> +  // Explicitly invoke the library constructor to resolve any library
> +  // dependency.
> +  ProcessLibraryConstructorList();
> +
>     // Note: The MMU will be enabled by MemoryPeim. Only the primary core will have the MMU on.
>   
>     // If not primary Jump to Secondary Main

Reviewed-by: Thomas Abraham <thomas.abraham at arm.com>
Tested-by: Thomas Abraham <thomas.abraham at arm.com>

Thanks.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#91115): https://edk2.groups.io/g/devel/message/91115
Mute This Topic: https://groups.io/mt/92206586/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-