From 81a981f14a7e31e81575589a49de5385c353f39c Mon Sep 17 00:00:00 2001 From: Volo <14126089+volo-droid@users.noreply.github.com> Date: Sun, 6 Oct 2024 18:13:48 +0200 Subject: [PATCH] efi/serial: fix serial re-init on x86_64 serial_init should be called after calling ExitBootServices Change-Id: I2a04ee1eaf1d1fe9aaed3fa65b5521161ff74130 Reviewed-on: https://review.haiku-os.org/c/haiku/+/8435 Reviewed-by: waddlesplash Haiku-Format: Haiku-format Bot Tested-by: Commit checker robot Reviewed-by: Fredrik Holmqvist --- src/system/boot/platform/efi/arch/x86_64/arch_start.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/system/boot/platform/efi/arch/x86_64/arch_start.cpp b/src/system/boot/platform/efi/arch/x86_64/arch_start.cpp index 56d376e03b..a82bd34fc1 100644 --- a/src/system/boot/platform/efi/arch/x86_64/arch_start.cpp +++ b/src/system/boot/platform/efi/arch/x86_64/arch_start.cpp @@ -145,9 +145,6 @@ arch_start_kernel(addr_t kernelEntry) // entry. dprintf("Calling ExitBootServices. So long, EFI!\n"); - - // Re-init and activate serial in a horrific post-EFI landscape. Clowns roam the land freely. - serial_init(); serial_disable(); while (true) { @@ -169,7 +166,8 @@ arch_start_kernel(addr_t kernelEntry) arch_mmu_post_efi_setup(memory_map_size, memory_map, descriptor_size, descriptor_version); - // Restart serial. gUART only until we get into the kernel + // Re-init and activate serial in a horrific post-EFI landscape. Clowns roam the land freely. + serial_init(); serial_enable(); smp_boot_other_cpus(final_pml4, kernelEntry, (addr_t)&gKernelArgs);