From: Ard Biesheuvel <ardb@kernel.org>
To: linux-efi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
Michael Roth <michael.roth@amd.com>
Subject: [PATCH v3 04/17] x86/compressed: efi-mixed: move efi32_pe_entry into .text section
Date: Tue, 22 Nov 2022 17:10:04 +0100 [thread overview]
Message-ID: <20221122161017.2426828-5-ardb@kernel.org> (raw)
In-Reply-To: <20221122161017.2426828-1-ardb@kernel.org>
Move efi32_pe_entry() into the .text section, so that it can be moved
out of head_64.S and into a separate compilation unit in a subsequent
patch.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
arch/x86/boot/compressed/head_64.S | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index b9dbc8127038c315..8192ab1c308567ce 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -778,7 +778,7 @@ SYM_DATA(efi_is64, .byte 1)
#define BS32_handle_protocol 88 // offsetof(efi_boot_services_32_t, handle_protocol)
#define LI32_image_base 32 // offsetof(efi_loaded_image_32_t, image_base)
- __HEAD
+ .text
.code32
SYM_FUNC_START(efi32_pe_entry)
/*
@@ -800,12 +800,11 @@ SYM_FUNC_START(efi32_pe_entry)
call 1f
1: pop %ebx
- subl $ rva(1b), %ebx
/* Get the loaded image protocol pointer from the image handle */
leal -4(%ebp), %eax
pushl %eax // &loaded_image
- leal rva(loaded_image_proto)(%ebx), %eax
+ leal (loaded_image_proto - 1b)(%ebx), %eax
pushl %eax // pass the GUID address
pushl 8(%ebp) // pass the image handle
@@ -834,13 +833,13 @@ SYM_FUNC_START(efi32_pe_entry)
movl 12(%ebp), %edx // sys_table
movl -4(%ebp), %esi // loaded_image
movl LI32_image_base(%esi), %esi // loaded_image->image_base
- movl %ebx, %ebp // startup_32 for efi32_pe_stub_entry
+ leal (startup_32 - 1b)(%ebx), %ebp // runtime address of startup_32
/*
* We need to set the image_offset variable here since startup_32() will
* use it before we get to the 64-bit efi_pe_entry() in C code.
*/
- subl %esi, %ebx
- movl %ebx, rva(image_offset)(%ebp) // save image_offset
+ subl %esi, %ebp // calculate image_offset
+ movl %ebp, (image_offset - 1b)(%ebx) // save image_offset
xorl %esi, %esi
jmp efi32_entry // pass %ecx, %edx, %esi
// no other registers remain live
--
2.35.1
next prev parent reply other threads:[~2022-11-22 16:11 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-22 16:10 [PATCH v3 00/17] x86: head_64.S spring cleaning Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 01/17] x86/compressed: efi-mixed: rename efi_thunk_64.S to efi-mixed.S Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Rename " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 02/17] x86/compressed: efi-mixed: move 32-bit entrypoint code into .text section Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 03/17] x86/compressed: efi-mixed: move bootargs parsing out of 32-bit startup code Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` Ard Biesheuvel [this message]
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move efi32_pe_entry into .text section tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 05/17] x86/compressed: efi-mixed: move efi32_entry out of head_64.S Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 06/17] x86/compressed: efi-mixed: move efi32_pe_entry() " Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 07/17] x86/compressed: efi: merge multiple definitions of image_offset into one Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed, efi: Merge " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 08/17] x86/compressed: efi-mixed: simplify IDT/GDT preserve/restore Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Simplify IDT/GDT preserve/restore in the EFI thunk tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 09/17] x86/compressed: avoid touching ECX in startup32_set_idt_entry() Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Avoid " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 10/17] x86/compressed: pull global variable ref up into startup32_load_idt() Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Pull global variable reference " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 11/17] x86/compressed: move startup32_load_idt() into .text section Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 12/17] x86/compressed: move startup32_load_idt() out of head_64.S Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 13/17] x86/compressed: move startup32_check_sev_cbit() into .text Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 14/17] x86/compressed: move startup32_check_sev_cbit() out of head_64.S Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Move " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 15/17] x86/compressed: adhere to calling convention in get_sev_encryption_bit() Ard Biesheuvel
2022-11-24 8:12 ` [tip: x86/boot] x86/boot/compressed: Adhere " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 16/17] x86/compressed: only build mem_encrypt.S if AMD_MEM_ENCRYPT=y Ard Biesheuvel
2022-11-24 8:11 ` [tip: x86/boot] x86/boot/compressed: Only " tip-bot2 for Ard Biesheuvel
2022-11-22 16:10 ` [PATCH v3 17/17] efi: x86: Make the deprecated EFI handover protocol optional Ard Biesheuvel
2022-11-22 18:56 ` Randy Dunlap
2022-11-24 8:11 ` [tip: x86/boot] x86/efi: " tip-bot2 for Ard Biesheuvel
2022-11-22 20:48 ` [PATCH v3 00/17] x86: head_64.S spring cleaning Tom Lendacky
2022-11-22 21:37 ` Ard Biesheuvel
2022-11-22 21:42 ` Ard Biesheuvel
2022-11-22 21:50 ` Tom Lendacky
2022-11-22 21:51 ` Ard Biesheuvel
2022-11-22 21:49 ` Tom Lendacky
2022-11-22 22:20 ` Borislav Petkov
2022-11-23 10:49 ` Borislav Petkov
2022-11-23 10:52 ` Ard Biesheuvel
2022-11-23 11:09 ` Borislav Petkov
2022-11-23 11:22 ` Ard Biesheuvel
2022-11-23 14:16 ` Tom Lendacky
2022-11-23 14:33 ` Ard Biesheuvel
2022-11-23 14:13 ` Tom Lendacky
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-all 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=20221122161017.2426828-5-ardb@kernel.org \
--to=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.roth@amd.com \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.