From cd5d7566d3378b268ad96c8dc986ebfc477573a0 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Tue, 12 May 2009 13:43:34 +0000 Subject: [PATCH] Use the debugging functions to print out the tree and resources. Signed-off-by: Myles Watson Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4271 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/devices/device.c | 14 ++++++++++++++ src/include/device/device.h | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/devices/device.c b/src/devices/device.c index 4a2ef12450..51a1203ec0 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -618,6 +618,12 @@ void dev_enumerate(void) unsigned subordinate; printk_info("Enumerating buses...\n"); root = &dev_root; + + show_all_devs(BIOS_DEBUG, "Before Phase 3."); + printk_debug("Compare with tree...\n"); + + show_devs_tree(root, BIOS_DEBUG, 0, 0); + if (root->chip_ops && root->chip_ops->enable_dev) { root->chip_ops->enable_dev(root); } @@ -651,6 +657,9 @@ void dev_configure(void) printk_info("Allocating resources...\n"); root = &dev_root; + + print_resource_tree(root, BIOS_DEBUG, "Original."); + if (!root->ops || !root->ops->read_resources) { printk_err("dev_root missing read_resources\n"); return; @@ -664,6 +673,8 @@ void dev_configure(void) root->ops->read_resources(root); printk_info("Done reading resources.\n"); + print_resource_tree(root, BIOS_DEBUG, "After reading."); + /* Get the resources */ io = &root->resource[0]; mem = &root->resource[1]; @@ -681,6 +692,7 @@ void dev_configure(void) #if CONFIG_CONSOLE_VGA == 1 /* Allocate the VGA I/O resource.. */ allocate_vga_resource(); + print_resource_tree(root, BIOS_DEBUG, "After VGA."); #endif /* Store the computed resource allocations into device registers ... */ @@ -691,6 +703,7 @@ void dev_configure(void) mem->flags |= IORESOURCE_STORED; report_resource_stored(root, mem, ""); #endif + print_resource_tree(root, BIOS_DEBUG, "After assigning values."); printk_info("Done allocating resources.\n"); } @@ -737,5 +750,6 @@ void dev_initialize(void) } } printk_info("Devices initialized\n"); + show_all_devs(BIOS_DEBUG, "After init."); } diff --git a/src/include/device/device.h b/src/include/device/device.h index be29d63bb1..22d6c71829 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -126,7 +126,6 @@ device_t dev_find_slot (unsigned int bus, unsigned int devfn); device_t dev_find_slot_on_smbus (unsigned int bus, unsigned int addr); /* Debug functions */ -void resource_tree(struct device * root, int debug_level, int depth); void print_resource_tree(struct device * root, int debug_level, const char *msg); void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum);