Changeset 211b17a1 in mainline for uspace/drv/nic/virtio-net/virtio-net.c

Timestamp:

2018-05-28T20:49:51Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0a087ae

Parents:

b085bbaa

Message:

Make virtio_net_dev_add more complete

File:

• uspace/drv/nic/virtio-net/virtio-net.c (modified) (3 diffs)

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

@@ -55 +55 @@
 #define CT_BUF_SIZE     BUFFER_SIZE
 
+static ddf_dev_ops_t virtio_net_dev_ops;
+
+static errno_t virtio_net_dev_add(ddf_dev_t *dev);
+
+static driver_ops_t virtio_net_driver_ops = {
+        .dev_add = virtio_net_dev_add
+};
+
+static driver_t virtio_net_driver = {
+        .name = NAME,
+        .driver_ops = &virtio_net_driver_ops
+};
 
 static errno_t virtio_net_setup_bufs(unsigned int buffers, size_t size,
@@ -227 +239 @@
 }
 
+static void virtio_net_uninitialize(ddf_dev_t *dev)
+{
+        nic_t *nic = ddf_dev_data_get(dev);
+        virtio_net_t *virtio_net = (virtio_net_t *) nic_get_specific(nic);
+
+        virtio_net_teardown_bufs(virtio_net->rx_buf);
+        virtio_net_teardown_bufs(virtio_net->tx_buf);
+        virtio_net_teardown_bufs(virtio_net->ct_buf);
+
+        virtio_device_setup_fail(&virtio_net->virtio_dev);
+        virtio_pci_dev_cleanup(&virtio_net->virtio_dev);
+}
+
 static errno_t virtio_net_dev_add(ddf_dev_t *dev)
 {
@@ -236 +261 @@
                 return rc;
 
-        return ENOTSUP;
-}
-
-static ddf_dev_ops_t virtio_net_dev_ops;
-
-static driver_ops_t virtio_net_driver_ops = {
-        .dev_add = virtio_net_dev_add
-};
-
-static driver_t virtio_net_driver = {
-        .name = NAME,
-        .driver_ops = &virtio_net_driver_ops
-};
+        ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "port0");
+        if (fun == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+        nic_t *nic = ddf_dev_data_get(dev);
+        nic_set_ddf_fun(nic, fun);
+        ddf_fun_set_ops(fun, &virtio_net_dev_ops);
+
+        rc = ddf_fun_bind(fun);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed binding device function");
+                goto uninitialize;
+        }
+
+        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function to category");
+                goto unbind;
+        }
+
+        ddf_msg(LVL_NOTE, "The %s device has been successfully initialized.",
+            ddf_dev_get_name(dev));
+
+        return EOK;
+
+unbind:
+        ddf_fun_unbind(fun);
+uninitialize:
+        virtio_net_uninitialize(dev);
+error:
+        return rc;
+}
 
 static nic_iface_t virtio_net_nic_iface;