pci: Avoid a crash in device_is_on_pci_bus()

This function cannot currently be called on the root node. Add a check
for this as well as a test.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/include/dm/device.h b/include/dm/device.h
index f5738a0cee97b1953d638524c1a8061aae930045..953706cf5256fb5e41d0862f9978f326044b11e3 100644 (file)
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -764,7 +764,7 @@ int dev_enable_by_path(const char *path);
  */
 static inline bool device_is_on_pci_bus(const struct udevice *dev)
 {
-       return device_get_uclass_id(dev->parent) == UCLASS_PCI;
+       return dev->parent && device_get_uclass_id(dev->parent) == UCLASS_PCI;
 }
 
 /**

diff --git a/test/dm/pci.c b/test/dm/pci.c
index fb93e4c78ae07077dc8473552c5ba39e16bcf3d4..39e82b3699f8af969fd84ffb911de29ba82118b8 100644 (file)
--- a/test/dm/pci.c
+++ b/test/dm/pci.c
@@ -339,3 +339,17 @@ static int dm_test_pci_addr_live(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_pci_addr_live, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT |
                DM_TESTF_LIVE_TREE);
+
+/* Test device_is_on_pci_bus() */
+static int dm_test_pci_on_bus(struct unit_test_state *uts)
+{
+       struct udevice *dev;
+
+       ut_assertok(dm_pci_bus_find_bdf(PCI_BDF(0, 0x1f, 0), &dev));
+       ut_asserteq(true, device_is_on_pci_bus(dev));
+       ut_asserteq(false, device_is_on_pci_bus(dev_get_parent(dev)));
+       ut_asserteq(true, device_is_on_pci_bus(dev));
+
+       return 0;
+}
+DM_TEST(dm_test_pci_on_bus, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);