Changeset 184f2f8a in mainline

Timestamp:

2018-10-29T11:35:40Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b25970f, f5837524

Parents:

889cdb1

git-author:

Jiri Svoboda <jiri@…> (2018-10-28 21:35:14)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-29 11:35:40)

Message:

PCI driver should fail when no devices are found. Handle error properly. Bind needs to come after HW initialization.

Location:

uspace/drv/bus/pci/pciintel

Files:

• pci.c (modified) (10 diffs)
• pci.h (modified) (1 diff)

uspace/drv/bus/pci/pciintel/pci.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -596 +596 @@
  * @param bus           Host-to-PCI bridge
  * @param bus_num       Bus number
+ *
+ * @return EOK on success, ENOENT if no PCI devices found, ENOMEM if out of
+ *         memory, EIO on other I/O error
  */
-void pci_bus_scan(pci_bus_t *bus, int bus_num)
+errno_t pci_bus_scan(pci_bus_t *bus, int bus_num)
 {
         pci_fun_t *fun;
@@ -606 +609 @@
         bool multi;
         uint8_t header_type;
+        bool device_found;
+
+        device_found = false;
 
         for (dnum = 0; dnum < 32; dnum++) {
@@ -625 +631 @@
                         }
 
+                        device_found = true;
+
                         header_type = pci_conf_read_8(fun, PCI_HEADER_TYPE);
                         if (fnum == 0) {
@@ -637 +645 @@
                                 ddf_msg(LVL_ERROR, "Out of memory.");
                                 pci_fun_delete(fun);
-                                return;
+                                return ENOMEM;
                         }
 
@@ -645 +653 @@
                                 ddf_msg(LVL_ERROR, "Failed setting function name.");
                                 pci_fun_delete(fun);
-                                return;
+                                return EIO;
                         }
 
@@ -661 +669 @@
 
                         pci_fun_create_match_ids(fun);
-
-                        if (ddf_fun_bind(fun->fnode) != EOK) {
-                                pci_clean_resource_list(fun);
-                                pci_fun_delete(fun);
-                                continue;
-                        }
 
                         if (header_type == PCI_HEADER_TYPE_BRIDGE ||
@@ -675 +677 @@
                                     "bridge, secondary bus number = %d.",
                                     bus_num);
-                                if (child_bus > bus_num)
-                                        pci_bus_scan(bus, child_bus);
+                                if (child_bus > bus_num) {
+                                        rc = pci_bus_scan(bus, child_bus);
+                                        if (rc != EOK) {
+                                                pci_fun_delete(fun);
+                                                return rc;
+                                        }
+                                }
+                        }
+
+                        if (ddf_fun_bind(fun->fnode) != EOK) {
+                                pci_clean_resource_list(fun);
+                                pci_fun_delete(fun);
+                                continue;
                         }
                 }
         }
+
+        /* Fail bus scan if no devices are found. */
+        if (!device_found)
+                return ENOENT;
+
+        return EOK;
 }
 
@@ -783 +802 @@
         }
 
+        /* Enumerate functions. */
+        ddf_msg(LVL_DEBUG, "Enumerating the bus");
+        rc = pci_bus_scan(bus, 0);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Bus enumeration failed.");
+                goto fail;
+        }
+
         rc = ddf_fun_bind(ctl);
         if (rc != EOK) {
@@ -788 +815 @@
                 goto fail;
         }
-
-        /* Enumerate functions. */
-        ddf_msg(LVL_DEBUG, "Scanning the bus");
-        pci_bus_scan(bus, 0);
 
         hw_res_clean_resource_list(&hw_resources);

uspace/drv/bus/pci/pciintel/pci.h

@@ -90 +90 @@
 extern char *pci_fun_create_name(pci_fun_t *);
 
-extern void pci_bus_scan(pci_bus_t *, int);
+extern errno_t pci_bus_scan(pci_bus_t *, int);
 
 extern bool pci_alloc_resource_list(pci_fun_t *);