From: Jordan Justen <jordan.l.justen@intel.com>
To: edk2-devel@lists.01.org
Cc: Jordan Justen <jordan.l.justen@intel.com>,
Jian J Wang <jian.j.wang@intel.com>, Hao Wu <hao.a.wu@intel.com>,
Ray Ni <ray.ni@intel.com>, Star Zeng <star.zeng@intel.com>
Subject: [PATCH 09/10] MdeModulePkg/Core/Pei: Use assembly for IA32 TemporaryRamMigration
Date: Sun, 17 Feb 2019 20:11:40 -0800 [thread overview]
Message-ID: <20190218041141.21363-10-jordan.l.justen@intel.com> (raw)
In-Reply-To: <20190218041141.21363-1-jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
---
.../Dispatcher/Ia32/TemporaryRamMigration.S | 72 +++++++++++++++++
.../Ia32/TemporaryRamMigration.nasm | 78 +++++++++++++++++++
MdeModulePkg/Core/Pei/PeiMain.inf | 3 +-
3 files changed, 152 insertions(+), 1 deletion(-)
create mode 100644 MdeModulePkg/Core/Pei/Dispatcher/Ia32/TemporaryRamMigration.S
create mode 100644 MdeModulePkg/Core/Pei/Dispatcher/Ia32/TemporaryRamMigration.nasm
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Ia32/TemporaryRamMigration.S b/MdeModulePkg/Core/Pei/Dispatcher/Ia32/TemporaryRamMigration.S
new file mode 100644
index 0000000000..363cadca2a
--- /dev/null
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Ia32/TemporaryRamMigration.S
@@ -0,0 +1,72 @@
+#------------------------------------------------------------------------------
+#
+# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
+#
+# 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.
+#
+#------------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# VOID
+# EFIAPI
+# PeiTemporaryRamMigration (
+# IN PEI_CORE_TEMPORARY_RAM_TRANSITION *TempRamTransitionData
+# );
+#
+# @param[in] Stack Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION
+#
+# @return None This routine does not return
+#------------------------------------------------------------------------------
+ASM_GLOBAL ASM_PFX(PeiTemporaryRamMigration)
+ASM_PFX(PeiTemporaryRamMigration):
+
+ #
+ # We never return from this call
+ #
+ add $4, %esp
+
+ #
+ # (eax) Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION
+ #
+ mov (%esp), %eax
+
+ #
+ # We'll store the new location of TempRamTransitionData after
+ # migration in ebx. By the IA32 calling convention we should
+ # normally save ebx, but we won't be returning to the caller, so
+ # we don't need to save it. By the same rule, the
+ # TemporaryRamMigration PPI call should preserve ebx for us.
+ #
+ mov (%esp), %ebx
+ add 0x10(%eax), %ebx
+ sub 0x08(%eax), %ebx
+
+ #
+ # Setup parameters and call TemporaryRamSupport->TemporaryRamMigration
+ # 32-bit PeiServices
+ # 64-bit TemporaryMemoryBase
+ # 64-bit PermanentMemoryBase
+ # 32-bit CopySize
+ #
+ pushl 0x18(%eax) # CopySize
+ pushl 0x14(%eax) # PermanentMemoryBase Upper 32-bit
+ pushl 0x10(%eax) # PermanentMemoryBase Lower 32-bit
+ pushl 0x0c(%eax) # TemporaryMemoryBase Upper 32-bit
+ pushl 0x08(%eax) # TemporaryMemoryBase Lower 32-bit
+ pushl 0x04(%eax) # PeiServices
+ calll *(%eax)
+ sub 0x18, %esp
+
+ #
+ # Setup parameters and call PeiTemporaryRamMigrated
+ # 32-bit Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION
+ #
+ push %ebx
+ call ASM_PFX(PeiTemporaryRamMigrated)
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Ia32/TemporaryRamMigration.nasm b/MdeModulePkg/Core/Pei/Dispatcher/Ia32/TemporaryRamMigration.nasm
new file mode 100644
index 0000000000..e200a3631f
--- /dev/null
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Ia32/TemporaryRamMigration.nasm
@@ -0,0 +1,78 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
+;
+; 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 <Base.h>
+
+ SECTION .text
+
+extern ASM_PFX(PeiTemporaryRamMigrated)
+
+;------------------------------------------------------------------------------
+; VOID
+; EFIAPI
+; PeiTemporaryRamMigration (
+; IN PEI_CORE_TEMPORARY_RAM_TRANSITION *TempRamTransitionData
+; );
+;
+; @param[in] Stack Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION
+;
+; @return None This routine does not return
+;------------------------------------------------------------------------------
+global ASM_PFX(PeiTemporaryRamMigration)
+ASM_PFX(PeiTemporaryRamMigration):
+
+ ;
+ ; We never return from this call
+ ;
+ add esp, 4
+
+ ;
+ ; (eax) Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION
+ ;
+ mov eax, [esp]
+
+ ;
+ ; We'll store the new location of TempRamTransitionData after
+ ; migration in ebx. By the IA32 calling convention we should
+ ; normally save ebx, but we won't be returning to the caller, so
+ ; we don't need to save it. By the same rule, the
+ ; TemporaryRamMigration PPI call should preserve ebx for us.
+ ;
+ mov ebx, [esp]
+ add ebx, [eax + 0x10]
+ sub ebx, [eax + 0x08]
+
+ ;
+ ; Setup parameters and call TemporaryRamSupport->TemporaryRamMigration
+ ; 32-bit PeiServices
+ ; 64-bit TemporaryMemoryBase
+ ; 64-bit PermanentMemoryBase
+ ; 32-bit CopySize
+ ;
+ push DWORD [eax + 0x18] ; CopySize
+ push DWORD [eax + 0x14] ; PermanentMemoryBase Upper 32-bit
+ push DWORD [eax + 0x10] ; PermanentMemoryBase Lower 32-bit
+ push DWORD [eax + 0x0c] ; TemporaryMemoryBase Upper 32-bit
+ push DWORD [eax + 0x08] ; TemporaryMemoryBase Lower 32-bit
+ push DWORD [eax + 0x04] ; PeiServices
+ call DWORD [eax + 0x00]
+ sub esp, 0x18
+
+ ;
+ ; Setup parameters and call PeiTemporaryRamMigrated
+ ; 32-bit Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION
+ ;
+ push ebx
+ call ASM_PFX(PeiTemporaryRamMigrated)
diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 1646f73385..505544d4e8 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -53,7 +53,8 @@
PeiMain.h
[Sources.Ia32]
- Dispatcher/TemporaryRamMigration.c
+ Dispatcher/Ia32/TemporaryRamMigration.nasm
+ Dispatcher/Ia32/TemporaryRamMigration.S
[Sources.X64]
Dispatcher/X64/TemporaryRamMigration.nasm
--
2.20.0.rc1
next prev parent reply other threads:[~2019-02-18 4:12 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-18 4:11 [PATCH 00/10] Fix PEI Core issue during TemporaryRamMigration Jordan Justen
2019-02-18 4:11 ` [PATCH 01/10] EmulatorPkg/build.sh: Fix missing usage of -b BUILDTARGET parameter Jordan Justen
2019-02-18 4:11 ` [PATCH 02/10] EmulatorPkg/Unix/Host: Use PcdInitValueInTempStack to init temp-ram Jordan Justen
2019-02-18 4:11 ` [PATCH 03/10] EmulatorPkg/Sec: Replace assembly temp-ram support with C code Jordan Justen
2019-02-18 4:11 ` [PATCH 04/10] EmulatorPkg/Sec: Disable optimizations for TemporaryRamMigration function Jordan Justen
2019-02-18 4:11 ` [PATCH 05/10] OvmfPkg/Sec: Swap TemporaryRam Stack and Heap locations Jordan Justen
2019-02-18 12:58 ` Laszlo Ersek
2019-02-18 4:11 ` [PATCH 06/10] OvmfPkg/Sec: Disable optimizations for TemporaryRamMigration Jordan Justen
2019-02-18 7:53 ` Ard Biesheuvel
2019-02-18 9:08 ` Jordan Justen
2019-02-18 9:32 ` Ard Biesheuvel
2019-02-18 13:01 ` Laszlo Ersek
2019-02-19 22:50 ` Brian J. Johnson
2019-02-19 23:58 ` Jordan Justen
2019-02-20 8:52 ` Jordan Justen
2019-02-20 8:59 ` Ard Biesheuvel
2019-02-18 4:11 ` [PATCH 07/10] MdeModePkg/Core/Pei: Add code path to allow assembly temp-ram migration Jordan Justen
2019-02-18 4:11 ` [PATCH 08/10] MdeModulePkg/Core/Pei: Use assembly for X64 TemporaryRamMigration Jordan Justen
2019-02-18 4:11 ` Jordan Justen [this message]
2019-02-18 4:11 ` [PATCH 10/10] OvmfPkg/Sec: Fill Temp Ram after TemporaryRamMigration Jordan Justen
2019-02-18 13:15 ` Laszlo Ersek
2019-02-19 2:46 ` [PATCH 00/10] Fix PEI Core issue during TemporaryRamMigration Ni, Ray
2019-02-19 13:25 ` Gao, Liming
2019-02-20 13:27 ` Ni, Ray
2019-02-20 17:43 ` Jordan Justen
2019-02-21 0:15 ` Ni, Ray
2019-02-21 1:03 ` Jordan Justen
2019-02-21 4:43 ` Ni, Ray
2019-02-19 19:27 ` Jordan Justen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190218041141.21363-10-jordan.l.justen@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox