linux-efi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] efi/libstub: "Exiting bootservices" message
@ 2021-08-29 12:49 Heinrich Schuchardt
  2021-08-29 12:53 ` Ard Biesheuvel
  0 siblings, 1 reply; 2+ messages in thread
From: Heinrich Schuchardt @ 2021-08-29 12:49 UTC (permalink / raw)
  To: Ard Biesheuvel
  Cc: Atish Patra, Heinrich Schuchardt, linux-efi, linux-kernel,
	Heinrich Schuchardt

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 we should print

    "Exiting boot services...\n"

in this case.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
 drivers/firmware/efi/libstub/fdt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
index 365c3a43a198..d871b1ac4d8b 100644
--- a/drivers/firmware/efi/libstub/fdt.c
+++ b/drivers/firmware/efi/libstub/fdt.c
@@ -271,7 +271,10 @@ efi_status_t allocate_new_fdt_and_exit_boot(void *handle,
 		return status;
 	}
 
-	efi_info("Exiting boot services and installing virtual address map...\n");
+	if (efi_novamap)
+		efi_info("Exiting boot services...\n");
+	else
+		efi_info("Exiting boot services and installing virtual address map...\n");
 
 	map.map = &memory_map;
 	status = efi_allocate_pages(MAX_FDT_SIZE, new_fdt_addr, ULONG_MAX);
-- 
2.30.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] efi/libstub: "Exiting bootservices" message
  2021-08-29 12:49 [PATCH] efi/libstub: "Exiting bootservices" message Heinrich Schuchardt
@ 2021-08-29 12:53 ` Ard Biesheuvel
  0 siblings, 0 replies; 2+ messages in thread
From: Ard Biesheuvel @ 2021-08-29 12:53 UTC (permalink / raw)
  To: Heinrich Schuchardt
  Cc: Atish Patra, Heinrich Schuchardt, linux-efi, Linux Kernel Mailing List

On Sun, 29 Aug 2021 at 14:50, Heinrich Schuchardt
<heinrich.schuchardt@canonical.com> 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 we should print
>
>     "Exiting boot services...\n"
>
> in this case.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

Hello Heinrich,

I agree with the analysis but I'd prefer to simply go with the shorter
string in all cases.

Thanks,
Ard.

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-29 12:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-29 12:49 [PATCH] efi/libstub: "Exiting bootservices" message Heinrich Schuchardt
2021-08-29 12:53 ` Ard Biesheuvel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).