MdeModulePkg/DxeIpl: Merge EBC, RISCV64 and LOONGARCH code

The Risc-V and LoongArch specific versions of the DXE core handoff code
in DxeIpl are essentially copies of the EBC version (modulo the
copyright in the header and some debug prints in the code).

In preparation for introducing a generic PPI based method to implement
the non-executable stack, let's merge these versions, so we only need to
add this logic once.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Oliver Smith-Denny <osde@linux.microsoft.com>
Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

4 files changed, 3 insertions, 147 deletions

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/DxeHandoff.c
index c1a16b6024..a0f85ebea5 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ebc/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeHandoff.c
@@ -1,5 +1,5 @@
 /** @file

-  EBC-specific functionality for DxeLoad.

+  Generic version of arch-specific functionality for DxeLoad.

 

 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index 052ea0ec1a..60c998be6c 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -45,17 +45,11 @@
   X64/VirtualMemory.c

   X64/DxeLoadFunc.c

 

-[Sources.EBC]

-  Ebc/DxeLoadFunc.c

-

 [Sources.ARM, Sources.AARCH64]

   Arm/DxeLoadFunc.c

 

-[Sources.RISCV64]

-  RiscV64/DxeLoadFunc.c

-

-[Sources.LOONGARCH64]

-  LoongArch64/DxeLoadFunc.c

+[Sources.LOONGARCH64,Sources.RISCV64,Sources.EBC]

+  DxeHandoff.c

 

 [Packages]

   MdePkg/MdePkg.dec

diff --git a/MdeModulePkg/Core/DxeIplPeim/LoongArch64/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/LoongArch64/DxeLoadFunc.c
deleted file mode 100644
index 95d3af19ea..0000000000
--- a/MdeModulePkg/Core/DxeIplPeim/LoongArch64/DxeLoadFunc.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/** @file

-  LoongArch specifc functionality for DxeLoad.

-

-  Copyright (c) 2022, Loongson Technology Corporation Limited. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#include "DxeIpl.h"

-

-/**

-   Transfers control to DxeCore.

-

-   This function performs a CPU architecture specific operations to execute

-   the entry point of DxeCore with the parameters of HobList.

-   It also installs EFI_END_OF_PEI_PPI to signal the end of PEI phase.

-

-   @param[in] DxeCoreEntryPoint         The entry point of DxeCore.

-   @param[in] HobList                   The start of HobList passed to DxeCore.

-

-**/

-VOID

-HandOffToDxeCore (

-  IN EFI_PHYSICAL_ADDRESS  DxeCoreEntryPoint,

-  IN EFI_PEI_HOB_POINTERS  HobList

-  )

-{

-  VOID        *BaseOfStack;

-  VOID        *TopOfStack;

-  EFI_STATUS  Status;

-

-  //

-  // Allocate 128KB for the Stack

-  //

-  BaseOfStack = AllocatePages (EFI_SIZE_TO_PAGES (STACK_SIZE));

-  ASSERT (BaseOfStack != NULL);

-

-  //

-  // Compute the top of the stack we were allocated. Pre-allocate a UINTN

-  // for safety.

-  //

-  TopOfStack = (VOID *)((UINTN)BaseOfStack + EFI_SIZE_TO_PAGES (STACK_SIZE) * EFI_PAGE_SIZE - CPU_STACK_ALIGNMENT);

-  TopOfStack = ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);

-

-  //

-  // End of PEI phase signal

-  //

-  Status = PeiServicesInstallPpi (&gEndOfPeiSignalPpi);

-  ASSERT_EFI_ERROR (Status);

-

-  //

-  // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.

-  //

-  UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN)BaseOfStack, STACK_SIZE);

-

-  SwitchStack (

-    (SWITCH_STACK_ENTRY_POINT)(UINTN)DxeCoreEntryPoint,

-    HobList.Raw,

-    NULL,

-    TopOfStack

-    );

-}

diff --git a/MdeModulePkg/Core/DxeIplPeim/RiscV64/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/RiscV64/DxeLoadFunc.c
deleted file mode 100644
index b3567d88f7..0000000000
--- a/MdeModulePkg/Core/DxeIplPeim/RiscV64/DxeLoadFunc.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/** @file

-  RISC-V specific functionality for DxeLoad.

-

-  Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#include "DxeIpl.h"

-

-/**

-   Transfers control to DxeCore.

-

-   This function performs a CPU architecture specific operations to execute

-   the entry point of DxeCore with the parameters of HobList.

-   It also installs EFI_END_OF_PEI_PPI to signal the end of PEI phase.

-

-   @param DxeCoreEntryPoint         The entry point of DxeCore.

-   @param HobList                   The start of HobList passed to DxeCore.

-

-**/

-VOID

-HandOffToDxeCore (

-  IN EFI_PHYSICAL_ADDRESS  DxeCoreEntryPoint,

-  IN EFI_PEI_HOB_POINTERS  HobList

-  )

-{

-  VOID        *BaseOfStack;

-  VOID        *TopOfStack;

-  EFI_STATUS  Status;

-

-  //

-  //

-  // Allocate 128KB for the Stack

-  //

-  BaseOfStack = AllocatePages (EFI_SIZE_TO_PAGES (STACK_SIZE));

-  if (BaseOfStack == NULL) {

-    DEBUG ((DEBUG_ERROR, "%a: Can't allocate memory for stack.", __func__));

-    ASSERT (FALSE);

-  }

-

-  //

-  // Compute the top of the stack we were allocated. Pre-allocate a UINTN

-  // for safety.

-  //

-  TopOfStack = (VOID *)((UINTN)BaseOfStack + EFI_SIZE_TO_PAGES (STACK_SIZE) * EFI_PAGE_SIZE - CPU_STACK_ALIGNMENT);

-  TopOfStack = ALIGN_POINTER (TopOfStack, CPU_STACK_ALIGNMENT);

-

-  //

-  // End of PEI phase signal

-  //

-  Status = PeiServicesInstallPpi (&gEndOfPeiSignalPpi);

-  if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: Fail to signal End of PEI event.", __func__));

-    ASSERT (FALSE);

-  }

-

-  //

-  // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.

-  //

-  UpdateStackHob ((EFI_PHYSICAL_ADDRESS)(UINTN)BaseOfStack, STACK_SIZE);

-

-  DEBUG ((DEBUG_INFO, "DXE Core new stack at %x, stack pointer at %x\n", BaseOfStack, TopOfStack));

-

-  //

-  // Transfer the control to the entry point of DxeCore.

-  //

-  SwitchStack (

-    (SWITCH_STACK_ENTRY_POINT)(UINTN)DxeCoreEntryPoint,

-    HobList.Raw,

-    NULL,

-    TopOfStack

-    );

-}