Skip to content

x86: head_64.S spring cleaning

Ard Biesheuvel linux-efi lkml 3 versions – Applied

Status from this message: The following commit has been merged into the x86/boot branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest17 patches 15 repliesApplied
  2. v216 patches 15 repliesSuperseded
  3. v16 patches 2 repliesSuperseded

Changes in v3 from the cover letter

- add some clarifying comments to the EFI mixed mode changes
- include patch to make the EFI handover protocol optional that was sent out separately before
- rebase onto tip/master

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/17x86/compressed: efi-mixed: rename efi_thunk_64.S to efi-mixed.Sarch/x86/boot/compressed/Makefile arch/x86/boot/compressed/efi_mixed.S+3 -30 replies
2/17x86/compressed: efi-mixed: move 32-bit entrypoint code into .text sectionarch/x86/boot/compressed/head_64.S+34 -140 replies
3/17x86/compressed: efi-mixed: move bootargs parsing out of 32-bit startup codearch/x86/boot/compressed/efi_mixed.S arch/x86/boot/compressed/head_64.S+47 -200 replies
4/17x86/compressed: efi-mixed: move efi32_pe_entry into .text sectionarch/x86/boot/compressed/head_64.S+5 -60 replies
5/17x86/compressed: efi-mixed: move efi32_entry out of head_64.Sarch/x86/boot/compressed/efi_mixed.S arch/x86/boot/compressed/head_64.S+47 -550 replies
6/17x86/compressed: efi-mixed: move efi32_pe_entry() out of head_64.Sarch/x86/boot/compressed/efi_mixed.S arch/x86/boot/compressed/head_64.S+83 -860 replies
7/17x86/compressed: efi: merge multiple definitions of image_offset into onearch/x86/boot/compressed/head_32.S arch/x86/boot/compressed/head_64.S drivers/firmware/efi/libstub/x86-stub.c+1 -90 replies
8/17x86/compressed: efi-mixed: simplify IDT/GDT preserve/restorearch/x86/boot/compressed/efi_mixed.S+7 -130 replies
9/17x86/compressed: avoid touching ECX in startup32_set_idt_entry()arch/x86/boot/compressed/head_64.S+2 -60 replies
10/17x86/compressed: pull global variable ref up into startup32_load_idt()arch/x86/boot/compressed/head_64.S+8 -120 replies
11/17x86/compressed: move startup32_load_idt() into .text sectionarch/x86/boot/compressed/head_64.S+20 -110 replies
12/17x86/compressed: move startup32_load_idt() out of head_64.Sarch/x86/boot/compressed/head_64.S arch/x86/boot/compressed/mem_encrypt.S+71 -730 replies
13/17x86/compressed: move startup32_check_sev_cbit() into .textarch/x86/boot/compressed/head_64.S+19 -160 replies
14/17x86/compressed: move startup32_check_sev_cbit() out of head_64.Sarch/x86/boot/compressed/head_64.S arch/x86/boot/compressed/mem_encrypt.S+68 -710 replies
15/17x86/compressed: adhere to calling convention in get_sev_encryption_bit()arch/x86/boot/compressed/head_64.S arch/x86/boot/compressed/mem_encrypt.S+3 -120 replies
16/17x86/compressed: only build mem_encrypt.S if AMD_MEM_ENCRYPT=yarch/x86/boot/compressed/Makefile arch/x86/boot/compressed/mem_encrypt.S+1 -30 replies
17/17efi: x86: Make the deprecated EFI handover protocol optionalarch/x86/Kconfig arch/x86/boot/compressed/head_64.S arch/x86/boot/header.S +1 more+23 -21 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 00/17] x86: head_64.S spring cleaning

After doing some cleanup work on the EFI code in head_64.S, the mixed mode code in particular, I noticed that the memory encryption pieces could use some attention as well, so I cleaned that up too.

Changes since v2:
- add some clarifying comments to the EFI mixed mode changes
- include patch to make the EFI handover protocol optional that was sent out separately before
- rebase onto tip/master

Changes since v1:
- at Boris's request, split the patches into smaller ones that are easier to review

Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Michael Roth <[email protected]>

Ard Biesheuvel (17):
x86/compressed: efi-mixed: rename efi_thunk_64.S to efi-mixed.S x86/compressed: efi-mixed: move 32-bit entrypoint code into .text
section
x86/compressed: efi-mixed: move bootargs parsing out of 32-bit startup
code
x86/compressed: efi-mixed: move efi32_pe_entry into .text section x86/compressed: efi-mixed: move efi32_entry out of head_64.S x86/compressed: efi-mixed: move efi32_pe_entry() out of head_64.S x86/compressed: efi: merge multiple definitions of image_offset into
one
x86/compressed: efi-mixed: simplify IDT/GDT preserve/restore x86/compressed: avoid touching ECX in startup32_set_idt_entry() x86/compressed: pull global variable ref up into startup32_load_idt() x86/compressed: move startup32_load_idt() into .text section x86/compressed: move startup32_load_idt() out of head_64.S x86/compressed: move startup32_check_sev_cbit() into .text x86/compressed: move startup32_check_sev_cbit() out of head_64.S x86/compressed: adhere to calling convention in
get_sev_encryption_bit()
x86/compressed: only build mem_encrypt.S if AMD_MEM_ENCRYPT=y
efi: x86: Make the deprecated EFI handover protocol optional

 arch/x86/Kconfig                        |  17 +
 arch/x86/boot/compressed/Makefile       |   8 +-
 arch/x86/boot/compressed/efi_mixed.S    | 351 ++++++++++++++++++++
 arch/x86/boot/compressed/efi_thunk_64.S | 195 -----------
 arch/x86/boot/compressed/head_32.S      |   4 -
 arch/x86/boot/compressed/head_64.S      | 303 +----------------
 arch/x86/boot/compressed/mem_encrypt.S  | 152 ++++++++-
 arch/x86/boot/header.S                  |   2 +-
 arch/x86/boot/tools/build.c             |   2 +
 drivers/firmware/efi/libstub/x86-stub.c |   2 +-
 10 files changed, 533 insertions(+), 503 deletions(-)
 create mode 100644 arch/x86/boot/compressed/efi_mixed.S
 delete mode 100644 arch/x86/boot/compressed/efi_thunk_64.S
Signature · 1 line
2.35.1