From: "Jordan Justen" <jordan.l.justen@intel.com>
To: devel@edk2.groups.io
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 v2 5/6] MdeModulePkg/Core/Pei: Add X64 assembly for TemporaryRamMigration
Date: Wed, 10 Apr 2019 01:39:59 -0700 [thread overview]
Message-ID: <20190410084000.19660-6-jordan.l.justen@intel.com> (raw)
In-Reply-To: <20190410084000.19660-1-jordan.l.justen@intel.com>
Some compilers may optimize register usage in ways that are
incompatible with the TemporaryRamSupport PPI. Using assembly code to
call the TemporaryRamMigration function prevents this issue.
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/X64/TemporaryRamMigration.nasm | 74 +++++++++++++++++++
MdeModulePkg/Core/Pei/PeiMain.inf | 3 +
2 files changed, 77 insertions(+)
create mode 100644 MdeModulePkg/Core/Pei/Dispatcher/X64/TemporaryRamMigration.nasm
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/X64/TemporaryRamMigration.nasm b/MdeModulePkg/Core/Pei/Dispatcher/X64/TemporaryRamMigration.nasm
new file mode 100644
index 0000000000..5de8acdf34
--- /dev/null
+++ b/MdeModulePkg/Core/Pei/Dispatcher/X64/TemporaryRamMigration.nasm
@@ -0,0 +1,74 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
+; SPDX-License-Identifier: BSD-2-Clause-Patent
+;
+;------------------------------------------------------------------------------
+
+#include <Base.h>
+
+ SECTION .text
+
+extern ASM_PFX(PeiTemporaryRamMigrated)
+
+;------------------------------------------------------------------------------
+; VOID
+; EFIAPI
+; PeiTemporaryRamMigration (
+; IN PEI_CORE_TEMPORARY_RAM_TRANSITION *TempRamTransitionData
+; );
+;
+; @param[in] RCX 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 rsp, 8
+
+ ;
+ ; (rax) Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION
+ ;
+ mov rax, rcx
+
+ ;
+ ; We store the TempRamTransitionData pointer in rbx. By the X64
+ ; calling convention we should normally save rbx, 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
+ ; rbx for us.
+ ;
+ mov rbx, rcx
+
+ ;
+ ; Setup parameters and call TemporaryRamSupport->TemporaryRamMigration
+ ; (rcx) PeiServices
+ ; (rdx) TemporaryMemoryBase
+ ; (r8) PermanentMemoryBase
+ ; (r9) CopySize
+ ;
+ mov rcx, [rax + 0x08]
+ mov rdx, [rax + 0x10]
+ mov r8, [rax + 0x18]
+ mov r9, [rax + 0x20]
+
+ ;
+ ; (rbx) Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION on stack
+ ;
+ ; Adjusted based on stack change made during
+ ; TemporaryRamSupport->TemporaryRamMigration call
+ ;
+ sub rbx, rsp
+ call [rax + 0x00]
+ add rbx, rsp
+
+ ;
+ ; Setup parameters and call PeiTemporaryRamMigrated
+ ; (rcx) Pointer to PEI_CORE_TEMPORARY_RAM_TRANSITION
+ ;
+ mov rcx, rbx
+ call ASM_PFX(PeiTemporaryRamMigrated)
diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 918c4a0df8..fb643a9dd5 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -59,6 +59,9 @@
[Sources.Ia32]
Dispatcher/Ia32/TemporaryRamMigration.nasm
+[Sources.X64]
+ Dispatcher/X64/TemporaryRamMigration.nasm
+
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
--
2.20.1
next prev parent reply other threads:[~2019-04-10 8:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-10 8:39 [PATCH v2 0/6] Fix PEI Core issue during TemporaryRamMigration Jordan Justen
2019-04-10 8:39 ` [PATCH v2 1/6] MdeModulePkg/Core/Pei: Add interface for assembly based TemporaryRamSupport Jordan Justen
2019-04-10 8:39 ` [PATCH v2 2/6] MdeModulePkg/Core/Pei: Add AARCH64 assembly for TemporaryRamMigration Jordan Justen
2019-04-10 8:39 ` [PATCH v2 3/6] MdeModulePkg/Core/Pei: Add ARM " Jordan Justen
2019-04-10 8:39 ` [PATCH v2 4/6] MdeModulePkg/Core/Pei: Add IA32 " Jordan Justen
2019-04-10 8:39 ` Jordan Justen [this message]
2019-04-10 8:40 ` [PATCH v2 6/6] MdeModulePkg/Core/Pei: Use code path for assembly based TemporaryRamSupport Jordan Justen
2019-04-10 16:41 ` [edk2-devel] [PATCH v2 0/6] Fix PEI Core issue during TemporaryRamMigration Ard Biesheuvel
2019-04-10 18:28 ` Laszlo Ersek
2019-04-10 18:31 ` Ard Biesheuvel
2019-04-10 18:54 ` Jordan Justen
2019-04-10 17:26 ` Laszlo Ersek
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=20190410084000.19660-6-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