x86: head_64.S spring cleaning
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
- v3 Latest17 patches 15 repliesApplied
- v216 patches 15 repliesSuperseded
- 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 files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/17 | x86/compressed: efi-mixed: rename efi_thunk_64.S to efi-mixed.Sarch/ arch/ | +3 | 0 replies | |
| 2/17 | x86/compressed: efi-mixed: move 32-bit entrypoint code into .text sectionarch/ | +34 | 0 replies | |
| 3/17 | x86/compressed: efi-mixed: move bootargs parsing out of 32-bit startup codearch/ arch/ | +47 | 0 replies | |
| 4/17 | x86/compressed: efi-mixed: move efi32_pe_entry into .text sectionarch/ | +5 | 0 replies | |
| 5/17 | x86/compressed: efi-mixed: move efi32_entry out of head_64.Sarch/ arch/ | +47 | 0 replies | |
| 6/17 | x86/compressed: efi-mixed: move efi32_pe_entry() out of head_64.Sarch/ arch/ | +83 | 0 replies | |
| 7/17 | x86/compressed: efi: merge multiple definitions of image_offset into onearch/ arch/ drivers/ | +1 | 0 replies | |
| 8/17 | x86/compressed: efi-mixed: simplify IDT/GDT preserve/restorearch/ | +7 | 0 replies | |
| 9/17 | x86/compressed: avoid touching ECX in startup32_set_idt_entry()arch/ | +2 | 0 replies | |
| 10/17 | x86/compressed: pull global variable ref up into startup32_load_idt()arch/ | +8 | 0 replies | |
| 11/17 | x86/compressed: move startup32_load_idt() into .text sectionarch/ | +20 | 0 replies | |
| 12/17 | x86/compressed: move startup32_load_idt() out of head_64.Sarch/ arch/ | +71 | 0 replies | |
| 13/17 | x86/compressed: move startup32_check_sev_cbit() into .textarch/ | +19 | 0 replies | |
| 14/17 | x86/compressed: move startup32_check_sev_cbit() out of head_64.Sarch/ arch/ | +68 | 0 replies | |
| 15/17 | x86/compressed: adhere to calling convention in get_sev_encryption_bit()arch/ arch/ | +3 | 0 replies | |
| 16/17 | x86/compressed: only build mem_encrypt.S if AMD_MEM_ENCRYPT=yarch/ arch/ | +1 | 0 replies | |
| 17/17 | efi: x86: Make the deprecated EFI handover protocol optionalarch/ arch/ arch/ +1 more | +23 | 1 reply |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.
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
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