Changeset 1d0620b in mainline

Timestamp:

2018-05-22T19:06:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4e2d387

Parents:

1c40351

git-author:

Jakub Jermar <jakub@…> (2018-04-25 18:11:13)

git-committer:

Jakub Jermar <jakub@…> (2018-05-22 19:06:50)

Message:

Cleanup the device if initialization fails

Location:

uspace

Files:

• drv/nic/virtio-net/virtio-net.c (modified) (4 diffs)
• lib/virtio/virtio-pci.c (modified) (1 diff)
• lib/virtio/virtio-pci.h (modified) (1 diff)

uspace/drv/nic/virtio-net/virtio-net.c ¶

@@ -86 +86 @@
 
         if (!features) {
-                pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_FAILED);
-                return ENOTSUP;
+                rc = ENOTSUP;
+                goto fail;
         }
 
@@ -100 +100 @@
         uint8_t status = pio_read_8(&cfg->device_status);
         if (!(status & VIRTIO_DEV_STATUS_FEATURES_OK)) {
-                pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_FAILED);
-                return ENOTSUP;
+                rc = ENOTSUP;
+                goto fail;
         }
 
@@ -109 +109 @@
                 nic_addr.address[i] = netcfg->mac[i];
         rc = nic_report_address(nic_data, &nic_addr);
-        if (rc != EOK) {
-                pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_FAILED);
-                return rc;
-        }
+        if (rc != EOK)
+                goto fail;
 
         ddf_msg(LVL_NOTE, "MAC address: %02x:%02x:%02x:%02x:%02x:%02x",
-            nic_addr.address[0], nic_addr.address[1],
-            nic_addr.address[2], nic_addr.address[3],
-            nic_addr.address[4], nic_addr.address[5]);
+            nic_addr.address[0], nic_addr.address[1], nic_addr.address[2],
+            nic_addr.address[3], nic_addr.address[4], nic_addr.address[5]);
 
         /* 8. Go live */
@@ -123 +120 @@
 
         return EOK;
+
+fail:
+        pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_FAILED);
+        virtio_pci_dev_cleanup(&virtio_net->virtio_dev);
+        return rc;
 }
 

uspace/lib/virtio/virtio-pci.c ¶

@@ -244 +244 @@
 }
 
+errno_t virtio_pci_dev_cleanup(virtio_dev_t *vdev)
+{
+        return disable_resources(vdev);
+}
+
 /** @}
  */

uspace/lib/virtio/virtio-pci.h ¶

@@ -100 +100 @@
 
 extern errno_t virtio_pci_dev_initialize(ddf_dev_t *, virtio_dev_t *);
+extern errno_t virtio_pci_dev_cleanup(virtio_dev_t *);
 
 #endif