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

View Change

device/pci: Declare pci_root_bus()

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

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

diff --git a/src/device/device_const.c b/src/device/device_const.c
index 6ce1d18..7fdb3dc 100644
--- a/src/device/device_const.c
+++ b/src/device/device_const.c
@@ -166,6 +166,8 @@
 	const struct bus *parent, const struct device_path *path)
 {
 	DEVTREE_CONST struct device *child;
+	if (!parent)
+		return NULL;
 	for (child = parent->children; child; child = child->sibling) {
 		if (path_eq(path, &child->path))
 			break;
@@ -183,10 +185,19 @@
 	return find_dev_path(parent, &path);
 }
 
-DEVTREE_CONST struct device *pcidev_path_on_root(pci_devfn_t devfn)
+DEVTREE_CONST struct bus *pci_root_bus(void)
 {
 	DEVTREE_CONST struct device *pci_domain;
 
+	pci_domain = dev_find_path(NULL, DEVICE_PATH_DOMAIN);
+	if (!pci_domain)
+		 return NULL;
+
+	return pci_domain->link_list;
+}
+
+DEVTREE_CONST struct device *pcidev_path_on_root(pci_devfn_t devfn)
+{
 	/* Work around pcidev_path_behind() below failing
 	 * due tue complicated devicetree with topology
 	 * being manipulated on-the-fly.
@@ -194,11 +205,7 @@
 	if (CONFIG(NORTHBRIDGE_AMD_AMDFAM10))
 		return dev_find_slot(0, devfn);
 
-	pci_domain = dev_find_path(NULL, DEVICE_PATH_DOMAIN);
-	if (!pci_domain)
-		return NULL;
-
-	return pcidev_path_behind(pci_domain->link_list, devfn);
+	return pcidev_path_behind(pci_root_bus(), 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 8e9454c..a200de0 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -289,6 +289,7 @@
 		pci_devfn_t devfn);
 DEVTREE_CONST struct device *pcidev_path_on_root(pci_devfn_t devfn);
 DEVTREE_CONST struct device *pcidev_on_root(uint8_t dev, uint8_t fn);
+DEVTREE_CONST struct bus *pci_root_bus(void);
 
 void scan_smbus(struct device *bus);
 void scan_generic_bus(struct device *bus);
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index f1de7bf..6f9093e 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -98,7 +98,7 @@
 
 const char *pin_to_str(int pin);
 int get_pci_irq_pins(struct device *dev, struct device **parent_bdg);
-void pci_assign_irqs(unsigned int bus, unsigned int slot,
+void pci_assign_irqs(struct bus *parent, unsigned int slot,
 		     const unsigned char pIntAtoD[4]);
 const char *get_pci_class_name(struct device *dev);
 const char *get_pci_subclass_name(struct device *dev);

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