2021-08-29 13:24:33

by Heinrich Schuchardt

Subject: [PATCH v2: 1/1] efi/libstub: "Exiting bootservices" message

The message

"Exiting boot services and installing virtual address map...\n"

is even shown if we have efi=novamap on the command line or the firmware
does not provide EFI_RT_SUPPORTED_SET_VIRTUAL_ADDRESS_MAP.

To avoid confusion just print

"Exiting boot services...\n"

Signed-off-by: Heinrich Schuchardt <[email protected]>
---
v2:
reduce complexity, use same message irrespective of efi_novamap
---
drivers/firmware/efi/libstub/fdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
index 365c3a43a198..fe567be0f118 100644
--- a/drivers/firmware/efi/libstub/fdt.c
+++ b/drivers/firmware/efi/libstub/fdt.c
@@ -271,7 +271,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(void *handle,
return status;
}

- efi_info("Exiting boot services and installing virtual address map...\n");
+ efi_info("Exiting boot services...\n");

map.map = &memory_map;
status = efi_allocate_pages(MAX_FDT_SIZE, new_fdt_addr, ULONG_MAX);
--
2.30.2

2021-08-29 14:10:22

by Ard Biesheuvel

Subject: Re: [PATCH v2: 1/1] efi/libstub: "Exiting bootservices" message

On Sun, 29 Aug 2021 at 15:23, Heinrich Schuchardt
<[email protected]> wrote:
>
> The message
>
> "Exiting boot services and installing virtual address map...\n"
>
> is even shown if we have efi=novamap on the command line or the firmware
> does not provide EFI_RT_SUPPORTED_SET_VIRTUAL_ADDRESS_MAP.
>
> To avoid confusion just print
>
> "Exiting boot services...\n"
>
> Signed-off-by: Heinrich Schuchardt <[email protected]>
> ---
> v2:
> reduce complexity, use same message irrespective of efi_novamap

Queued up now, thanks.

> ---
> drivers/firmware/efi/libstub/fdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
> index 365c3a43a198..fe567be0f118 100644
> --- a/drivers/firmware/efi/libstub/fdt.c
> +++ b/drivers/firmware/efi/libstub/fdt.c
> @@ -271,7 +271,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(void *handle,
> return status;
> }
>
> - efi_info("Exiting boot services and installing virtual address map...\n");
> + efi_info("Exiting boot services...\n");
>
> map.map = &memory_map;
> status = efi_allocate_pages(MAX_FDT_SIZE, new_fdt_addr, ULONG_MAX);
> --
> 2.30.2
>