aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/device/device_const.c22
-rw-r--r--src/include/device/device.h1
2 files changed, 17 insertions, 6 deletions
diff --git a/src/device/device_const.c b/src/device/device_const.c
index 6ce1d18c93..1853b4c4d2 100644
--- a/src/device/device_const.c
+++ b/src/device/device_const.c
@@ -183,10 +183,24 @@ DEVTREE_CONST struct device *pcidev_path_behind(
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;
+ MAYBE_STATIC DEVTREE_CONST struct bus *pci_root = NULL;
+
+ if (pci_root)
+ return pci_root;
+
+ pci_domain = dev_find_path(NULL, DEVICE_PATH_DOMAIN);
+ if (!pci_domain)
+ return NULL;
+
+ pci_root = pci_domain->link_list;
+ return pci_root;
+}
+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 +208,7 @@ DEVTREE_CONST struct device *pcidev_path_on_root(pci_devfn_t devfn)
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 8e9454c4e1..a200de0876 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -289,6 +289,7 @@ DEVTREE_CONST struct device *pcidev_path_behind(const struct bus *parent,
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);