Changeset 659bd24 in mainline

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1c53d93

Parents:

5f03107

git-author:

Jakub Jermar <jakub@…> (2018-04-25 21:19:18)

git-committer:

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

Message:

Do not zero device status bits

File:

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

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

@@ -70 +70 @@
 
         /* 1. Reset the device */
-        pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_RESET);
+        uint8_t status = VIRTIO_DEV_STATUS_RESET;
+        pio_write_8(&cfg->device_status, status);
 
         /* 2. Acknowledge we found the device */
-        pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_ACKNOWLEDGE);
+        status |= VIRTIO_DEV_STATUS_ACKNOWLEDGE;
+        pio_write_8(&cfg->device_status, status);
 
         /* 3. We know how to drive the device */
-        pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_DRIVER);
+        status |= VIRTIO_DEV_STATUS_DRIVER;
+        pio_write_8(&cfg->device_status, status);
 
         /* 4. Read the offered feature flags */
@@ -95 +98 @@
 
         /* 5. Set FEATURES_OK */
-        pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_FEATURES_OK);
+        status |= VIRTIO_DEV_STATUS_FEATURES_OK;
+        pio_write_8(&cfg->device_status, status);
 
         /* 6. Test if the device supports our feature subset */ 
-        uint8_t status = pio_read_8(&cfg->device_status);
+        status = pio_read_8(&cfg->device_status);
         if (!(status & VIRTIO_DEV_STATUS_FEATURES_OK)) {
                 rc = ENOTSUP;
@@ -117 +121 @@
 
         /* 8. Go live */
-        pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_DRIVER_OK);
+        status |= VIRTIO_DEV_STATUS_DRIVER_OK;
+        pio_write_8(&cfg->device_status, status);
 
         return EOK;
 
 fail:
-        pio_write_8(&cfg->device_status, VIRTIO_DEV_STATUS_FAILED);
+        status |= VIRTIO_DEV_STATUS_FAILED;
+        pio_write_8(&cfg->device_status, status);
         virtio_pci_dev_cleanup(&virtio_net->virtio_dev);
         return rc;