Kyösti Mälkki has uploaded this change for review.

View Change

device/hypertransport: Drop dev_find_slot() debugging

Change-Id: I810ca9cfc72de9ea532d53cabdaf8845be837432
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/device/device.c
M src/device/device_const.c
M src/include/device/device.h
3 files changed, 5 insertions(+), 32 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/30704/1

diff --git a/src/device/device.c b/src/device/device.c
index 20a4077..7836af1 100644
--- a/src/device/device.c
+++ b/src/device/device.c
@@ -1253,7 +1253,4 @@
 		final_link(link);
 
 	printk(BIOS_INFO, "Devices finalized\n");
-
-	if (IS_ENABLED(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT))
-		ht_report_devtree_sanity();
 }
diff --git a/src/device/device_const.c b/src/device/device_const.c
index 480ac76..cdae33d 100644
--- a/src/device/device_const.c
+++ b/src/device/device_const.c
@@ -177,15 +177,6 @@
  * Work around the devicetree topology being manipulated on-the-fly
  * on systems with HyperTransport Support.
  */
-
-static int ht_tree_needs_fixing, ht_tree_fixup_failed;
-
-void ht_report_devtree_sanity(void)
-{
-	printk(BIOS_INFO, "HT fixup counters %d / %d (rqrd/failed)\n",
-			ht_tree_needs_fixing, ht_tree_fixup_failed);
-}
-
 static const struct bus *ht_bus_reloc(const struct bus *parent,
 					      pci_devfn_t devfn)
 {
@@ -222,34 +213,20 @@
 
 DEVTREE_CONST struct device *pcidev_path_on_root(pci_devfn_t devfn)
 {
-	DEVTREE_CONST struct device *dev;
 	DEVTREE_CONST struct device *pci_domain;
+	const struct bus *root;
 
 	pci_domain = dev_find_path(NULL, DEVICE_PATH_DOMAIN);
 	if (!pci_domain)
 		return NULL;
 
-	dev = pcidev_path_behind(pci_domain->link_list, devfn);
+	root = pci_domain->link_list;
 
 	/* Static devicetree with HyperTransport has whacky topology. */
-	if (!IS_ENABLED(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT))
-		return dev;
+	if (IS_ENABLED(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT))
+		root = ht_bus_reloc(root, devfn);
 
-	DEVTREE_CONST struct device *dev_fixup, *dev_old_method;
-
-	const struct bus *root = ht_bus_reloc(pci_domain->link_list, devfn);
-	dev_fixup = pcidev_path_behind(root, devfn);
-	dev_old_method = dev_find_slot(0, devfn);
-
-	if (ENV_RAMSTAGE) {
-		if (dev != dev_old_method)
-			ht_tree_needs_fixing++;
-
-		if (dev_fixup != dev_old_method)
-			ht_tree_fixup_failed++;
-	}
-
-	return dev_old_method;
+	return pcidev_path_behind(root, devfn);
 }
 
 DEVTREE_CONST struct device *pcidev_on_root(uint8_t dev, uint8_t fn)
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 40a0f58..540b7e3 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -227,7 +227,6 @@
 void show_one_resource(int debug_level, struct device *dev,
 		       struct resource *resource, const char *comment);
 void show_all_devs_resources(int debug_level, const char *msg);
-void ht_report_devtree_sanity(void);
 
 /* Rounding for boundaries.
  * Due to some chip bugs, go ahead and round IO to 16

To view, visit change 30704. To unsubscribe, or for help writing mail filters, visit settings.