From patchwork Fri Mar 10 02:17:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 662205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4C13C64EC4 for ; Fri, 10 Mar 2023 02:18:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229751AbjCJCSG (ORCPT ); Thu, 9 Mar 2023 21:18:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229550AbjCJCSF (ORCPT ); Thu, 9 Mar 2023 21:18:05 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 176221DBB4; Thu, 9 Mar 2023 18:18:03 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A147B6092E; Fri, 10 Mar 2023 02:18:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC47EC433D2; Fri, 10 Mar 2023 02:17:59 +0000 (UTC) From: Huacai Chen To: Ard Biesheuvel , Huacai Chen Cc: linux-efi@vger.kernel.org, loongarch@lists.linux.dev, Xuefeng Li , Xuerui Wang , linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn, Huacai Chen Subject: [PATCH V2] efi/libstub: Call setup_graphics() before handle_kernel_image() Date: Fri, 10 Mar 2023 10:17:49 +0800 Message-Id: <20230310021749.921041-1-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org Commit 42c8ea3dca094ab8 ("efi: libstub: Factor out EFI stub entrypoint into separate file") moves setup_graphics() into efi_stub_common() which is after handle_kernel_image(). This causes efifb no longer work because handle_kernel_image() may move the core kernel to its preferred address, which means the screen_info filled by the efistub will not be the same as the one accessed by the core kernel. So let us call setup_graphics() before handle_kernel_image() which restores the old behavior. The side effect is zboot will not call setup_graphics(), but I think zboot doesn't need it either. Fixes: 42c8ea3dca094ab8 ("efi: libstub: Factor out EFI stub entrypoint into separate file") Signed-off-by: Huacai Chen --- V2: Use static declaration for setup_graphics() to avoid build warnings. drivers/firmware/efi/libstub/efi-stub-entry.c | 29 +++++++++++++++++++ drivers/firmware/efi/libstub/efi-stub.c | 27 ----------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/drivers/firmware/efi/libstub/efi-stub-entry.c b/drivers/firmware/efi/libstub/efi-stub-entry.c index 5245c4f031c0..f971fd25a4eb 100644 --- a/drivers/firmware/efi/libstub/efi-stub-entry.c +++ b/drivers/firmware/efi/libstub/efi-stub-entry.c @@ -5,6 +5,30 @@ #include "efistub.h" +static struct screen_info *setup_graphics(void) +{ + unsigned long size; + efi_status_t status; + efi_guid_t gop_proto = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; + void **gop_handle = NULL; + struct screen_info *si = NULL; + + size = 0; + status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL, + &gop_proto, NULL, &size, gop_handle); + if (status == EFI_BUFFER_TOO_SMALL) { + si = alloc_screen_info(); + if (!si) + return NULL; + status = efi_setup_gop(si, &gop_proto, size); + if (status != EFI_SUCCESS) { + free_screen_info(si); + return NULL; + } + } + return si; +} + /* * EFI entry point for the generic EFI stub used by ARM, arm64, RISC-V and * LoongArch. This is the entrypoint that is described in the PE/COFF header @@ -22,6 +46,7 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle, efi_guid_t loaded_image_proto = LOADED_IMAGE_PROTOCOL_GUID; unsigned long reserve_addr = 0; unsigned long reserve_size = 0; + struct screen_info *si; WRITE_ONCE(efi_system_table, systab); @@ -47,6 +72,8 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle, efi_info("Booting Linux Kernel...\n"); + si = setup_graphics(); + status = handle_kernel_image(&image_addr, &image_size, &reserve_addr, &reserve_size, @@ -58,6 +85,8 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle, status = efi_stub_common(handle, image, image_addr, cmdline_ptr); + free_screen_info(si); + efi_free(image_size, image_addr); efi_free(reserve_size, reserve_addr); diff --git a/drivers/firmware/efi/libstub/efi-stub.c b/drivers/firmware/efi/libstub/efi-stub.c index 2955c1ac6a36..bc67af721412 100644 --- a/drivers/firmware/efi/libstub/efi-stub.c +++ b/drivers/firmware/efi/libstub/efi-stub.c @@ -56,30 +56,6 @@ void __weak free_screen_info(struct screen_info *si) { } -static struct screen_info *setup_graphics(void) -{ - efi_guid_t gop_proto = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; - efi_status_t status; - unsigned long size; - void **gop_handle = NULL; - struct screen_info *si = NULL; - - size = 0; - status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL, - &gop_proto, NULL, &size, gop_handle); - if (status == EFI_BUFFER_TOO_SMALL) { - si = alloc_screen_info(); - if (!si) - return NULL; - status = efi_setup_gop(si, &gop_proto, size); - if (status != EFI_SUCCESS) { - free_screen_info(si); - return NULL; - } - } - return si; -} - static void install_memreserve_table(void) { struct linux_efi_memreserve *rsv; @@ -163,14 +139,12 @@ efi_status_t efi_stub_common(efi_handle_t handle, unsigned long image_addr, char *cmdline_ptr) { - struct screen_info *si; efi_status_t status; status = check_platform_features(); if (status != EFI_SUCCESS) return status; - si = setup_graphics(); efi_retrieve_tpm2_eventlog(); @@ -190,7 +164,6 @@ efi_status_t efi_stub_common(efi_handle_t handle, status = efi_boot_kernel(handle, image, image_addr, cmdline_ptr); - free_screen_info(si); return status; }