[PATCH v4 37/45] x86: Convert some debug statements to use logging
Bin Meng
bmeng.cn at gmail.com
Thu Jul 13 12:49:50 CEST 2023
Hi Simon,
On Mon, Jun 19, 2023 at 8:02 PM Simon Glass <sjg at chromium.org> wrote:
>
> Move from using debug() to log_debug() so that we don't have to use the
> __func__ parameter and can access other logging features.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> (no changes since v2)
>
> Changes in v2:
> - Add new patch to convert some debug statements to use logging
>
> arch/x86/cpu/intel_common/mrc.c | 10 +++++-----
> arch/x86/cpu/ivybridge/sdram.c | 4 +++-
> arch/x86/lib/mrccache.c | 6 ++++--
> arch/x86/lib/spl.c | 22 ++++++++++++++--------
> drivers/gpio/intel_ich6_gpio.c | 5 +++--
> drivers/pch/pch9.c | 6 ++++--
> 6 files changed, 33 insertions(+), 20 deletions(-)
>
> diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
> index 69405d740b47..2819bae02e3c 100644
> --- a/arch/x86/cpu/intel_common/mrc.c
> +++ b/arch/x86/cpu/intel_common/mrc.c
> @@ -3,6 +3,8 @@
> * Copyright (c) 2016 Google, Inc
> */
>
> +#define LOG_CATEGORY UCLASS_RAM
> +
> #include <common.h>
> #include <dm.h>
> #include <init.h>
> @@ -144,12 +146,10 @@ int mrc_locate_spd(struct udevice *dev, int size, const void **spd_datap)
>
> ret = gpio_request_list_by_name(dev, "board-id-gpios", desc,
> ARRAY_SIZE(desc), GPIOD_IS_IN);
> - if (ret < 0) {
> - debug("%s: gpio ret=%d\n", __func__, ret);
> - return ret;
> - }
> + if (ret < 0)
> + return log_msg_ret("gp", ret);
nits: gp => gpio, otherwise it's too simple to confuse people
> spd_index = dm_gpio_get_values_as_int(desc, ret);
> - debug("spd index %d\n", spd_index);
> + log_debug("spd index %d\n", spd_index);
>
> node = fdt_first_subnode(blob, dev_of_offset(dev));
> if (node < 0)
> diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
> index 1a0ec433e654..0718aefbb1fe 100644
> --- a/arch/x86/cpu/ivybridge/sdram.c
> +++ b/arch/x86/cpu/ivybridge/sdram.c
> @@ -9,6 +9,8 @@
> * Copyright (C) 2011 Google Inc.
> */
>
> +#define LOG_CATEGORY UCLASS_RAM
> +
> #include <common.h>
> #include <dm.h>
> #include <errno.h>
> @@ -213,7 +215,7 @@ static int copy_spd(struct udevice *dev, struct pei_data *peid)
>
> ret = mrc_locate_spd(dev, sizeof(peid->spd_data[0]), &data);
> if (ret) {
> - debug("%s: Could not locate SPD (ret=%d)\n", __func__, ret);
> + log_debug("Could not locate SPD (err=%d)\n", ret);
> return ret;
> }
>
> diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
> index 2f6f6880003e..6494b8d26341 100644
> --- a/arch/x86/lib/mrccache.c
> +++ b/arch/x86/lib/mrccache.c
> @@ -6,6 +6,8 @@
> * Copyright (C) 2015 Bin Meng <bmeng.cn at gmail.com>
> */
>
> +#define LOG_CATEGORY UCLASS_RAM
> +
> #include <common.h>
> #include <dm.h>
> #include <errno.h>
> @@ -197,8 +199,8 @@ static void mrccache_setup(struct mrc_output *mrc, void *data)
> cache->signature = MRC_DATA_SIGNATURE;
> cache->data_size = mrc->len;
> checksum = compute_ip_checksum(mrc->buf, cache->data_size);
> - debug("Saving %d bytes for MRC output data, checksum %04x\n",
> - cache->data_size, checksum);
> + log_debug("Saving %d bytes for MRC output data, checksum %04x\n",
> + cache->data_size, checksum);
> cache->checksum = checksum;
> cache->reserved = 0;
> memcpy(cache->data, mrc->buf, cache->data_size);
> diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
> index 090fa718dbf9..6886587f647f 100644
> --- a/arch/x86/lib/spl.c
> +++ b/arch/x86/lib/spl.c
> @@ -3,6 +3,8 @@
> * Copyright (c) 2016 Google, Inc
> */
>
> +#define LOG_CATEGORY LOGC_BOOT
> +
> #include <common.h>
> #include <cpu_func.h>
> #include <debug_uart.h>
> @@ -76,25 +78,25 @@ static int x86_spl_init(void)
> #endif
> int ret;
>
> - debug("%s starting\n", __func__);
> + log_debug("x86 spl starting\n");
> if (IS_ENABLED(TPL))
> ret = x86_cpu_reinit_f();
> else
> ret = x86_cpu_init_f();
> ret = spl_init();
> if (ret) {
> - debug("%s: spl_init() failed\n", __func__);
> + log_debug("spl_init() failed (err=%d)\n", ret);
> return ret;
> }
> ret = arch_cpu_init();
> if (ret) {
> - debug("%s: arch_cpu_init() failed\n", __func__);
> + log_debug("arch_cpu_init() failed (err=%d)\n", ret);
> return ret;
> }
> #ifndef CONFIG_TPL
> ret = fsp_setup_pinctrl(NULL, NULL);
> if (ret) {
> - debug("%s: fsp_setup_pinctrl() failed\n", __func__);
> + log_debug("fsp_setup_pinctrl() failed (err=%d)\n", ret);
> return ret;
> }
> #endif
> @@ -103,23 +105,25 @@ static int x86_spl_init(void)
> #if !defined(CONFIG_TPL) && !CONFIG_IS_ENABLED(CPU)
> ret = print_cpuinfo();
> if (ret) {
> - debug("%s: print_cpuinfo() failed\n", __func__);
> + log_debug("print_cpuinfo() failed (err=%d)\n", ret);
> return ret;
> }
> #endif
> ret = dram_init();
> if (ret) {
> - debug("%s: dram_init() failed\n", __func__);
> + log_debug("dram_init() failed (err=%d)\n", ret);
> return ret;
> }
> + log_debug("mrc\n");
> if (IS_ENABLED(CONFIG_ENABLE_MRC_CACHE)) {
> ret = mrccache_spl_save();
> if (ret)
> - debug("%s: Failed to write to mrccache (err=%d)\n",
> - __func__, ret);
> + log_debug("Failed to write to mrccache (err=%d)\n",
> + ret);
> }
>
> #ifndef CONFIG_SYS_COREBOOT
> + log_debug("bss\n");
> debug("BSS clear from %lx to %lx len %lx\n", (ulong)&__bss_start,
> (ulong)&__bss_end, (ulong)&__bss_end - (ulong)&__bss_start);
> memset(&__bss_start, 0, (ulong)&__bss_end - (ulong)&__bss_start);
> @@ -140,6 +144,7 @@ static int x86_spl_init(void)
> gd->new_gd = (struct global_data *)ptr;
> memcpy(gd->new_gd, gd, sizeof(*gd));
>
> + log_debug("logging\n");
> /*
> * Make sure logging is disabled when we switch, since the log system
> * list head will move
> @@ -179,6 +184,7 @@ static int x86_spl_init(void)
> debug("Failed to set CPU frequency (err=%d)\n", ret);
> # endif
> #endif
> + log_debug("done\n");
>
> return 0;
> }
> diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
> index 63a07b9592a0..2ed0d0bea9a5 100644
> --- a/drivers/gpio/intel_ich6_gpio.c
> +++ b/drivers/gpio/intel_ich6_gpio.c
> @@ -26,6 +26,8 @@
> * reserved or subject to arcane restrictions.
> */
>
> +#define LOG_CATEGORY UCLASS_GPIO
> +
> #include <common.h>
> #include <dm.h>
> #include <errno.h>
> @@ -155,8 +157,7 @@ static int ich6_gpio_request(struct udevice *dev, unsigned offset,
> */
> tmplong = inl(bank->use_sel);
> if (!(tmplong & (1UL << offset))) {
> - debug("%s: gpio %d is reserved for internal use\n", __func__,
> - offset);
> + log_debug("gpio %d is reserved for internal use\n", offset);
> return -EPERM;
> }
>
> diff --git a/drivers/pch/pch9.c b/drivers/pch/pch9.c
> index 3bd011518b3a..3137eb2c28f5 100644
> --- a/drivers/pch/pch9.c
> +++ b/drivers/pch/pch9.c
> @@ -3,6 +3,8 @@
> * Copyright (C) 2014 Google, Inc
> */
>
> +#define LOG_CATEGORY UCLASS_PCH
> +
> #include <common.h>
> #include <dm.h>
> #include <log.h>
> @@ -38,7 +40,7 @@ static int pch9_get_gpio_base(struct udevice *dev, u32 *gbasep)
> */
> dm_pci_read_config32(dev, GPIO_BASE, &base);
> if (base == 0x00000000 || base == 0xffffffff) {
> - debug("%s: unexpected BASE value\n", __func__);
> + log_debug("unexpected BASE value\n");
> return -ENODEV;
> }
>
> @@ -59,7 +61,7 @@ static int pch9_get_io_base(struct udevice *dev, u32 *iobasep)
>
> dm_pci_read_config32(dev, IO_BASE, &base);
> if (base == 0x00000000 || base == 0xffffffff) {
> - debug("%s: unexpected BASE value\n", __func__);
> + log_debug("unexpected BASE value\n");
> return -ENODEV;
> }
>
> --
Otherwise,
Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
Regards,
Bin
More information about the U-Boot
mailing list