Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 05:33:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: Convert some debug statements to use logging

Browse source 
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@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2023-07-15 21:39:11 -06:00 committed by Bin Meng
parent 6a32489782
commit e2e7de8747
6 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/cpu/intel_common/mrc.c
View file

@ -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("gpio", ret);
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)

4
arch/x86/cpu/ivybridge/sdram.c
View file

@ -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;
}

6
arch/x86/lib/mrccache.c
View file

@ -6,6 +6,8 @@
* Copyright (C) 2015 Bin Meng <bmeng.cn@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);

22
arch/x86/lib/spl.c
View file

@ -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
@ -108,23 +110,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);
@ -145,6 +149,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
@ -184,6 +189,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;
}

5
drivers/gpio/intel_ich6_gpio.c
View file

@ -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;
}

6
drivers/pch/pch9.c
View file

@ -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;
}