x86: Convert some debug statements to use logging

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>

diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c
index 69405d740b47dd39e9f84d3fba6a0e8b3046588a..56cc253831aa1f97bccb0c3fc75b1008a2c5a439 100644 (file)
--- 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("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)

diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index 1a0ec433e654aa0083d33f4477a3ea0361144e95..0718aefbb1fe795676f49da3544ea6a95fbe816a 100644 (file)
--- 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 2f6f6880003ee18b224809af30226ebec9b6a33d..6494b8d2634189a98ff2a92d55628ac338cef54e 100644 (file)
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -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);

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 92a5e6aec7112e9ac21a1294dfd42d02a83e4788..ba3434b055c3f708d07f7f8fb1c696a4d5915fa0 100644 (file)
--- 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
@@ -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;
 }

diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 63a07b9592a0cdda102db5b14580f7938eeac55f..2ed0d0bea9a59738698f33ac47f5cdb0ffa3f6e5 100644 (file)
--- 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 3bd011518b3ad013e0cba9da740f18b9593a136f..3137eb2c28f5bb4e846aacaf636058c3fb2e7791 100644 (file)
--- 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;
        }