[PATCH 1/1] efi_loader: use LOGC_EFI consistently
Ilias Apalodimas
ilias.apalodimas at linaro.org
Fri Jan 17 10:20:24 CET 2025
On Thu, 16 Jan 2025 at 21:27, Heinrich Schuchardt
<heinrich.schuchardt at canonical.com> wrote:
>
> The log category should be LOGC_EFI all over the EFI sub-system.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
> ---
> lib/efi_driver/efi_block_device.c | 2 ++
> lib/efi_driver/efi_uclass.c | 2 ++
> lib/efi_loader/efi_acpi.c | 2 ++
> lib/efi_loader/efi_boottime.c | 2 ++
> lib/efi_loader/efi_conformance.c | 2 ++
> lib/efi_loader/efi_device_path_to_text.c | 2 ++
> lib/efi_loader/efi_device_path_utilities.c | 2 ++
> lib/efi_loader/efi_dt_fixup.c | 2 ++
> lib/efi_loader/efi_esrt.c | 2 ++
> lib/efi_loader/efi_fdt.c | 2 ++
> lib/efi_loader/efi_file.c | 2 ++
> lib/efi_loader/efi_firmware.c | 2 ++
> lib/efi_loader/efi_gop.c | 2 ++
> lib/efi_loader/efi_helper.c | 1 +
> lib/efi_loader/efi_hii.c | 2 ++
> lib/efi_loader/efi_hii_config.c | 2 ++
> lib/efi_loader/efi_http.c | 2 ++
> lib/efi_loader/efi_ipconfig.c | 2 ++
> lib/efi_loader/efi_load_initrd.c | 1 +
> lib/efi_loader/efi_net.c | 2 ++
> lib/efi_loader/efi_riscv.c | 1 +
> lib/efi_loader/efi_root_node.c | 2 ++
> lib/efi_loader/efi_runtime.c | 2 ++
> lib/efi_loader/efi_signature.c | 2 ++
> lib/efi_loader/efi_string.c | 2 ++
> lib/efi_loader/efi_tcg2.c | 1 +
> lib/efi_loader/efi_unicode_collation.c | 2 ++
> lib/efi_loader/efi_var_common.c | 2 ++
> lib/efi_loader/efi_var_mem.c | 2 ++
> lib/efi_loader/efi_variable_tee.c | 2 ++
> lib/efi_loader/efi_watchdog.c | 2 ++
> 31 files changed, 58 insertions(+)
>
> diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
> index 19a5ee24794..d3c668dc183 100644
> --- a/lib/efi_driver/efi_block_device.c
> +++ b/lib/efi_driver/efi_block_device.c
> @@ -28,6 +28,8 @@
> * iPXE uses the simple file protocol to load Grub or the Linux Kernel.
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <blk.h>
> #include <dm.h>
> #include <efi_driver.h>
> diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c
> index e1e28df20b2..495be53cb77 100644
> --- a/lib/efi_driver/efi_uclass.c
> +++ b/lib/efi_driver/efi_uclass.c
> @@ -17,6 +17,8 @@
> * controllers.
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <dm.h>
> #include <efi_driver.h>
> #include <log.h>
> diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c
> index 67bd7f8ca24..c1cc6e7b311 100644
> --- a/lib/efi_loader/efi_acpi.c
> +++ b/lib/efi_loader/efi_acpi.c
> @@ -5,6 +5,8 @@
> * Copyright (C) 2018, Bin Meng <bmeng.cn at gmail.com>
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <log.h>
> #include <mapmem.h>
> diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
> index ccbaad2b549..9f51db90f33 100644
> --- a/lib/efi_loader/efi_boottime.c
> +++ b/lib/efi_loader/efi_boottime.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2016 Alexander Graf
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <bootm.h>
> #include <div64.h>
> #include <dm/device.h>
> diff --git a/lib/efi_loader/efi_conformance.c b/lib/efi_loader/efi_conformance.c
> index 167067e26cd..2bae93a94bd 100644
> --- a/lib/efi_loader/efi_conformance.c
> +++ b/lib/efi_loader/efi_conformance.c
> @@ -5,6 +5,8 @@
> * Copyright (C) 2022 Arm Ltd.
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <log.h>
> #include <efi_api.h>
> diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
> index 481a9712d9d..f6889cb7399 100644
> --- a/lib/efi_loader/efi_device_path_to_text.c
> +++ b/lib/efi_loader/efi_device_path_to_text.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2017 Heinrich Schuchardt
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <blk.h>
> #include <efi_loader.h>
> #include <malloc.h>
> diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c
> index ac250bbfcc9..552c5bb1f05 100644
> --- a/lib/efi_loader/efi_device_path_utilities.c
> +++ b/lib/efi_loader/efi_device_path_utilities.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2017 Leif Lindholm
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
>
> const efi_guid_t efi_guid_device_path_utilities_protocol =
> diff --git a/lib/efi_loader/efi_dt_fixup.c b/lib/efi_loader/efi_dt_fixup.c
> index 0dac94b0c6c..26928cfc454 100644
> --- a/lib/efi_loader/efi_dt_fixup.c
> +++ b/lib/efi_loader/efi_dt_fixup.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2020 Heinrich Schuchardt
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_dt_fixup.h>
> #include <efi_loader.h>
> #include <efi_rng.h>
> diff --git a/lib/efi_loader/efi_esrt.c b/lib/efi_loader/efi_esrt.c
> index 443bd999ce1..e235c8fe91c 100644
> --- a/lib/efi_loader/efi_esrt.c
> +++ b/lib/efi_loader/efi_esrt.c
> @@ -5,6 +5,8 @@
> * Copyright (C) 2021 Arm Ltd.
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <log.h>
> #include <efi_api.h>
> diff --git a/lib/efi_loader/efi_fdt.c b/lib/efi_loader/efi_fdt.c
> index f882622fdad..1ba6641d821 100644
> --- a/lib/efi_loader/efi_fdt.c
> +++ b/lib/efi_loader/efi_fdt.c
> @@ -6,6 +6,8 @@
> * Written by Simon Glass <sjg at chromium.org>
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <env.h>
> #include <errno.h>
> diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
> index 95b3c890ee9..201fa5f8f3c 100644
> --- a/lib/efi_loader/efi_file.c
> +++ b/lib/efi_loader/efi_file.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2017 Rob Clark
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <charset.h>
> #include <efi_loader.h>
> #include <log.h>
> diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c
> index 112775daf4c..5a754c9cd03 100644
> --- a/lib/efi_loader/efi_firmware.c
> +++ b/lib/efi_loader/efi_firmware.c
> @@ -6,6 +6,8 @@
> * Author: AKASHI Takahiro
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <charset.h>
> #include <dfu.h>
> #include <efi_loader.h>
> diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
> index 41e12fa7246..4593975be5a 100644
> --- a/lib/efi_loader/efi_gop.c
> +++ b/lib/efi_loader/efi_gop.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2016 Alexander Graf
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <dm.h>
> #include <efi_loader.h>
> #include <log.h>
> diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c
> index bf96f61d3d0..04b2efc4a3b 100644
> --- a/lib/efi_loader/efi_helper.c
> +++ b/lib/efi_loader/efi_helper.c
> @@ -4,6 +4,7 @@
> */
>
> #define LOG_CATEGORY LOGC_EFI
> +
> #include <bootm.h>
> #include <env.h>
> #include <image.h>
> diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
> index 74e402df1b8..44235970a7c 100644
> --- a/lib/efi_loader/efi_hii.c
> +++ b/lib/efi_loader/efi_hii.c
> @@ -6,6 +6,8 @@
> * Copyright (c) 2018 AKASHI Takahiro, Linaro Limited
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <malloc.h>
> #include <asm/unaligned.h>
> diff --git a/lib/efi_loader/efi_hii_config.c b/lib/efi_loader/efi_hii_config.c
> index 54a72d573be..521481a86d8 100644
> --- a/lib/efi_loader/efi_hii_config.c
> +++ b/lib/efi_loader/efi_hii_config.c
> @@ -6,6 +6,8 @@
> * Copyright (c) 2018 AKASHI Takahiro, Linaro Limited
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
>
> const efi_guid_t efi_guid_hii_config_routing_protocol
> diff --git a/lib/efi_loader/efi_http.c b/lib/efi_loader/efi_http.c
> index 694e1993418..88816256b03 100644
> --- a/lib/efi_loader/efi_http.c
> +++ b/lib/efi_loader/efi_http.c
> @@ -7,6 +7,8 @@
> * IP4_CONFIG2_PROTOCOL
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <charset.h>
> #include <efi_loader.h>
> #include <image.h>
> diff --git a/lib/efi_loader/efi_ipconfig.c b/lib/efi_loader/efi_ipconfig.c
> index 0b247a4c028..f1c092daafd 100644
> --- a/lib/efi_loader/efi_ipconfig.c
> +++ b/lib/efi_loader/efi_ipconfig.c
> @@ -4,6 +4,8 @@
> *
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <image.h>
> #include <malloc.h>
> diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c
> index 23508431c83..fb8cc7bcbe3 100644
> --- a/lib/efi_loader/efi_load_initrd.c
> +++ b/lib/efi_loader/efi_load_initrd.c
> @@ -4,6 +4,7 @@
> */
>
> #define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <efi_load_initrd.h>
> #include <efi_variable.h>
> diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
> index 67593ef50c0..ce9272fa240 100644
> --- a/lib/efi_loader/efi_net.c
> +++ b/lib/efi_loader/efi_net.c
> @@ -15,6 +15,8 @@
> * Reset(): EfiSimpleNetworkInitialized -> EfiSimpleNetworkInitialized
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <dm.h>
> #include <linux/sizes.h>
> diff --git a/lib/efi_loader/efi_riscv.c b/lib/efi_loader/efi_riscv.c
> index 4d398c5be34..6f2ccf4f7e6 100644
> --- a/lib/efi_loader/efi_riscv.c
> +++ b/lib/efi_loader/efi_riscv.c
> @@ -7,6 +7,7 @@
> */
>
> #define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <efi_variable.h>
> #include <log.h>
> diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c
> index 426f77cb2ad..e5246f65df2 100644
> --- a/lib/efi_loader/efi_root_node.c
> +++ b/lib/efi_loader/efi_root_node.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2018 Heinrich Schuchardt
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <malloc.h>
> #include <efi_dt_fixup.h>
> #include <efi_loader.h>
> diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
> index 05369c47b01..35eb6a77766 100644
> --- a/lib/efi_loader/efi_runtime.c
> +++ b/lib/efi_loader/efi_runtime.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2016 Alexander Graf
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <command.h>
> #include <cpu_func.h>
> #include <dm.h>
> diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c
> index 184eac8cddb..93a4f257016 100644
> --- a/lib/efi_loader/efi_signature.c
> +++ b/lib/efi_loader/efi_signature.c
> @@ -4,6 +4,8 @@
> * Copyright (c) 2019 Linaro Limited, Author: AKASHI Takahiro
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <charset.h>
> #include <efi_loader.h>
> #include <efi_variable.h>
> diff --git a/lib/efi_loader/efi_string.c b/lib/efi_loader/efi_string.c
> index 413e329b600..50d1daf33a9 100644
> --- a/lib/efi_loader/efi_string.c
> +++ b/lib/efi_loader/efi_string.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2020 AKASHI Takahiro, Linaro Limited
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <charset.h>
> #include <efi_loader.h>
> #include <malloc.h>
> diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c
> index a15c73162ee..c697b53441a 100644
> --- a/lib/efi_loader/efi_tcg2.c
> +++ b/lib/efi_loader/efi_tcg2.c
> @@ -8,6 +8,7 @@
> */
>
> #define LOG_CATEGORY LOGC_EFI
> +
> #include <dm.h>
> #include <efi_loader.h>
> #include <efi_variable.h>
> diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c
> index d48700a352b..df2a988ee39 100644
> --- a/lib/efi_loader/efi_unicode_collation.c
> +++ b/lib/efi_loader/efi_unicode_collation.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2018 Heinrich Schuchardt <xypron.glpk at gmx.de>
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <charset.h>
> #include <cp1250.h>
> #include <cp437.h>
> diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c
> index ea8d2a4cf98..4b34a58b4cf 100644
> --- a/lib/efi_loader/efi_var_common.c
> +++ b/lib/efi_loader/efi_var_common.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2020 Linaro Limited, Author: AKASHI Takahiro
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <efi_variable.h>
> #include <stdlib.h>
> diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c
> index 139e16aad7c..b265d95dd6b 100644
> --- a/lib/efi_loader/efi_var_mem.c
> +++ b/lib/efi_loader/efi_var_mem.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2020, Heinrich Schuchardt
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
> #include <efi_variable.h>
> #include <u-boot/crc.h>
> diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c
> index 8b6b0a39086..0d090d051dd 100644
> --- a/lib/efi_loader/efi_variable_tee.c
> +++ b/lib/efi_loader/efi_variable_tee.c
> @@ -10,6 +10,8 @@
> * Abdellatif El Khlifi <abdellatif.elkhlifi at arm.com>
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #if CONFIG_IS_ENABLED(ARM_FFA_TRANSPORT)
> #include <arm_ffa.h>
> #endif
> diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c
> index f5fb9117717..c21d8086074 100644
> --- a/lib/efi_loader/efi_watchdog.c
> +++ b/lib/efi_loader/efi_watchdog.c
> @@ -5,6 +5,8 @@
> * Copyright (c) 2017 Heinrich Schuchardt
> */
>
> +#define LOG_CATEGORY LOGC_EFI
> +
> #include <efi_loader.h>
>
> /* Conversion factor from seconds to multiples of 100ns */
> --
> 2.47.1
>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>
More information about the U-Boot
mailing list