On Wed, May 31, 2023 at 10:45:17AM -0700, Raymond Mao wrote:
> Changes for complying to EFI spec ยง3.5.1.1
> 'Removable Media Boot Behavior'.
> Boot variables can be automatically generated during a removable
> media is probed. At the same time, unused boot variables will be
> detected and removed.
>
The code seems fine, but I think there's some things that need to be
clarified on the commit message for future reference.
Can you add a short text describing *why* you only do that in
efi_disk_probe() and not when the disk is signalled to be removed as well?
IOW mention the fact that the _remove() callback is always called when we
are exiting U-Boot trying to boot and OS, so running the same function in
remove doesn't currently make sense.
With that addition
Reviewed-by: Ilias Apalodimas <ilias.apalodi...@linaro.org>
> Signed-off-by: Raymond Mao <raymond....@linaro.org>
> ---
> Changes in v3
> - Split the patch into moving and renaming functions and
> individual patches for each changed functionality
> Changes in v5
> - Move function call of efi_bootmgr_update_media_device_boot_option()
> from efi_init_variables() to efi_init_obj_list()
> Changes in v6
> - Revert unrelated changes
> Changes in v7
> - adapt the return code of function
> efi_bootmgr_update_media_device_boot_option()
>
> lib/efi_loader/efi_disk.c | 7 +++++++
> lib/efi_loader/efi_setup.c | 5 +++++
> 2 files changed, 12 insertions(+)
>
> diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
> index d2256713a8..d9b48ecf64 100644
> --- a/lib/efi_loader/efi_disk.c
> +++ b/lib/efi_loader/efi_disk.c
> @@ -687,6 +687,13 @@ int efi_disk_probe(void *ctx, struct event *event)
> return -1;
> }
>
> + /* only do the boot option management when UEFI sub-system is
> initialized */
> + if (efi_obj_list_initialized == EFI_SUCCESS) {
> + ret = efi_bootmgr_update_media_device_boot_option();
> + if (ret != EFI_SUCCESS)
> + return -1;
> + }
> +
> return 0;
> }
>
> diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
> index 58d4e13402..877f3878d6 100644
> --- a/lib/efi_loader/efi_setup.c
> +++ b/lib/efi_loader/efi_setup.c
> @@ -245,6 +245,11 @@ efi_status_t efi_init_obj_list(void)
> if (ret != EFI_SUCCESS)
> goto out;
>
> + /* update boot option after variable service initialized */
> + ret = efi_bootmgr_update_media_device_boot_option();
> + if (ret != EFI_SUCCESS)
> + goto out;
> +
> /* Define supported languages */
> ret = efi_init_platform_lang();
> if (ret != EFI_SUCCESS)
> --
> 2.25.1
>
