| Message ID | 20220921145422.437618-1-ardb@kernel.org |
|---|---|
| Headers | show |
| Series | x86: head_64.S spring cleaning | expand |
On Wed, Sep 21, 2022 at 04:54:06PM +0200, Ard Biesheuvel wrote: > arch/x86/boot/compressed/Makefile | 8 +- > arch/x86/boot/compressed/efi_mixed.S | 337 ++++++++++++++++++++ > arch/x86/boot/compressed/efi_thunk_64.S | 195 ----------- > arch/x86/boot/compressed/head_32.S | 4 - > arch/x86/boot/compressed/head_64.S | 299 +---------------- > arch/x86/boot/compressed/mem_encrypt.S | 152 ++++++++- > drivers/firmware/efi/libstub/x86-stub.c | 2 +- > 7 files changed, 496 insertions(+), 501 deletions(-) > create mode 100644 arch/x86/boot/compressed/efi_mixed.S > delete mode 100644 arch/x86/boot/compressed/efi_thunk_64.S Ok, it all looks ok to me. You could send me a refreshed version ontop of latest tip/master, after having tested the EFI side and I'll test the memory encryption side. If there's no fallout, I think we could queue this. Thx.
On Fri, 18 Nov 2022 at 19:26, Borislav Petkov <bp@alien8.de> wrote: > > On Wed, Sep 21, 2022 at 04:54:06PM +0200, Ard Biesheuvel wrote: > > arch/x86/boot/compressed/Makefile | 8 +- > > arch/x86/boot/compressed/efi_mixed.S | 337 ++++++++++++++++++++ > > arch/x86/boot/compressed/efi_thunk_64.S | 195 ----------- > > arch/x86/boot/compressed/head_32.S | 4 - > > arch/x86/boot/compressed/head_64.S | 299 +---------------- > > arch/x86/boot/compressed/mem_encrypt.S | 152 ++++++++- > > drivers/firmware/efi/libstub/x86-stub.c | 2 +- > > 7 files changed, 496 insertions(+), 501 deletions(-) > > create mode 100644 arch/x86/boot/compressed/efi_mixed.S > > delete mode 100644 arch/x86/boot/compressed/efi_thunk_64.S > > Ok, it all looks ok to me. > > You could send me a refreshed version ontop of latest tip/master, after > having tested the EFI side and I'll test the memory encryption side. > > If there's no fallout, I think we could queue this. > Sounds good.
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. I have been sitting on these patches since November, waiting for the right time to post them, i.e., after the SEV/SNP review had finished. This has yet to happen, so I'm posting them now instead. Please feel free to disregard for the time being, and propose a suitable timeframe to repost them if this is likely to conflict with ongoing work. Changes since v1: - at Boris's request, split the patches into smaller ones that are easier to review Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Michael Roth <michael.roth@amd.com> Ard Biesheuvel (16): 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 arch/x86/boot/compressed/Makefile | 8 +- arch/x86/boot/compressed/efi_mixed.S | 337 ++++++++++++++++++++ arch/x86/boot/compressed/efi_thunk_64.S | 195 ----------- arch/x86/boot/compressed/head_32.S | 4 - arch/x86/boot/compressed/head_64.S | 299 +---------------- arch/x86/boot/compressed/mem_encrypt.S | 152 ++++++++- drivers/firmware/efi/libstub/x86-stub.c | 2 +- 7 files changed, 496 insertions(+), 501 deletions(-) create mode 100644 arch/x86/boot/compressed/efi_mixed.S delete mode 100644 arch/x86/boot/compressed/efi_thunk_64.S