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 v2 07/16] x86/compressed: efi: merge multiple definitions of image_offset into one
Date: Wed, 21 Sep 2022 16:54:13 +0200 [thread overview]
Message-ID: <20220921145422.437618-8-ardb@kernel.org> (raw)
In-Reply-To: <20220921145422.437618-1-ardb@kernel.org>
There is no need for head_32.S and head_64.S both declaring a copy of
the globale 'image_offset' variable, so drop those and make the extern C
declaration the definition.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
arch/x86/boot/compressed/head_32.S | 4 ----
arch/x86/boot/compressed/head_64.S | 4 ----
drivers/firmware/efi/libstub/x86-stub.c | 2 +-
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index 3b354eb9516d..6589ddd4cfaf 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -208,10 +208,6 @@ SYM_DATA_START_LOCAL(gdt)
.quad 0x00cf92000000ffff /* __KERNEL_DS */
SYM_DATA_END_LABEL(gdt, SYM_L_LOCAL, gdt_end)
-#ifdef CONFIG_EFI_STUB
-SYM_DATA(image_offset, .long 0)
-#endif
-
/*
* Stack and heap for uncompression
*/
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 8da2396a35a8..90b119fbef58 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -718,10 +718,6 @@ SYM_DATA_START(boot32_idt)
SYM_DATA_END_LABEL(boot32_idt, SYM_L_GLOBAL, boot32_idt_end)
#endif
-#ifdef CONFIG_EFI_STUB
-SYM_DATA(image_offset, .long 0)
-#endif
-
#ifdef CONFIG_AMD_MEM_ENCRYPT
__HEAD
.code32
diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index 05ae8bcc9d67..9083ccc1d46b 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -23,7 +23,7 @@
const efi_system_table_t *efi_system_table;
const efi_dxe_services_table_t *efi_dxe_table;
-extern u32 image_offset;
+u32 image_offset;
static efi_loaded_image_t *image = NULL;
static efi_status_t
--
2.35.1
next prev parent reply other threads:[~2022-09-21 14:55 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 14:54 [PATCH v2 00/16] x86: head_64.S spring cleaning Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 01/16] x86/compressed: efi-mixed: rename efi_thunk_64.S to efi-mixed.S Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 02/16] x86/compressed: efi-mixed: move 32-bit entrypoint code into .text section Ard Biesheuvel
2022-10-06 10:42 ` Borislav Petkov
2022-10-06 10:56 ` Ard Biesheuvel
2022-10-06 11:13 ` Borislav Petkov
2022-10-06 11:19 ` Ard Biesheuvel
2022-10-06 12:27 ` Ard Biesheuvel
2022-10-07 8:56 ` Borislav Petkov
2022-09-21 14:54 ` [PATCH v2 03/16] x86/compressed: efi-mixed: move bootargs parsing out of 32-bit startup code Ard Biesheuvel
2022-10-06 11:03 ` Borislav Petkov
2022-10-06 11:29 ` Ard Biesheuvel
2022-10-07 9:30 ` Borislav Petkov
2022-09-21 14:54 ` [PATCH v2 04/16] x86/compressed: efi-mixed: move efi32_pe_entry into .text section Ard Biesheuvel
2022-11-17 15:57 ` Borislav Petkov
2022-11-17 16:06 ` Ard Biesheuvel
2022-11-17 17:08 ` Borislav Petkov
2022-09-21 14:54 ` [PATCH v2 05/16] x86/compressed: efi-mixed: move efi32_entry out of head_64.S Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 06/16] x86/compressed: efi-mixed: move efi32_pe_entry() " Ard Biesheuvel
2022-09-21 14:54 ` Ard Biesheuvel [this message]
2022-09-21 14:54 ` [PATCH v2 08/16] x86/compressed: efi-mixed: simplify IDT/GDT preserve/restore Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 09/16] x86/compressed: avoid touching ECX in startup32_set_idt_entry() Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 10/16] x86/compressed: pull global variable ref up into startup32_load_idt() Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 11/16] x86/compressed: move startup32_load_idt() into .text section Ard Biesheuvel
2022-11-18 16:44 ` Borislav Petkov
2022-09-21 14:54 ` [PATCH v2 12/16] x86/compressed: move startup32_load_idt() out of head_64.S Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 13/16] x86/compressed: move startup32_check_sev_cbit() into .text Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 14/16] x86/compressed: move startup32_check_sev_cbit() out of head_64.S Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 15/16] x86/compressed: adhere to calling convention in get_sev_encryption_bit() Ard Biesheuvel
2022-09-21 14:54 ` [PATCH v2 16/16] x86/compressed: only build mem_encrypt.S if AMD_MEM_ENCRYPT=y Ard Biesheuvel
2022-11-18 18:26 ` [PATCH v2 00/16] x86: head_64.S spring cleaning Borislav Petkov
2022-11-18 23:31 ` Ard Biesheuvel
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=20220921145422.437618-8-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).