Changeset fbfe59d in mainline for uspace/lib/drv/include/pci_dev_iface.h

Timestamp:

2018-06-25T21:45:05Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8119363

Parents:

2498b95 (diff), e3107e2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'virtio-net'

This commit merges basic support for the virtio-net NIC. As of now, the
driver does not support any advanced features that might be supported by
the device. Also device removal is not yet supported.

File:

• uspace/lib/drv/include/pci_dev_iface.h (modified) (2 diffs)

uspace/lib/drv/include/pci_dev_iface.h

@@ -42 +42 @@
 #define PCI_VENDOR_ID   0x00
 #define PCI_DEVICE_ID   0x02
+#define PCI_STATUS      0x06
 #define PCI_SUB_CLASS   0x0A
 #define PCI_BASE_CLASS  0x0B
+#define PCI_BAR0        0x10
+#define PCI_CAP_PTR     0x34
+
+#define PCI_BAR_COUNT   6
+
+#define PCI_STATUS_CAP_LIST     (1 << 4)
+
+#define PCI_CAP_ID(c)   ((c) + 0x0)
+#define PCI_CAP_NEXT(c) ((c) + 0x1)
+
+#define PCI_CAP_PMID            0x1
+#define PCI_CAP_VENDORSPECID    0x9
 
 extern errno_t pci_config_space_read_8(async_sess_t *, uint32_t, uint8_t *);
@@ -52 +65 @@
 extern errno_t pci_config_space_write_16(async_sess_t *, uint32_t, uint16_t);
 extern errno_t pci_config_space_write_32(async_sess_t *, uint32_t, uint32_t);
+
+static inline errno_t
+pci_config_space_cap_first(async_sess_t *sess, uint8_t *c, uint8_t *id)
+{
+        errno_t rc;
+        uint16_t status;
+
+        rc = pci_config_space_read_16(sess, PCI_STATUS, &status);
+        if (rc != EOK)
+                return rc;
+
+        if (!(status & PCI_STATUS_CAP_LIST)) {
+                *c = 0;
+                return EOK;
+        }
+
+        rc = pci_config_space_read_8(sess, PCI_CAP_PTR, c);
+        if (rc != EOK)
+                return rc;
+        if (!c)
+                return EOK;
+        return pci_config_space_read_8(sess, PCI_CAP_ID(*c), id);
+}
+
+static inline errno_t
+pci_config_space_cap_next(async_sess_t *sess, uint8_t *c, uint8_t *id)
+{
+        errno_t rc = pci_config_space_read_8(sess, PCI_CAP_NEXT(*c), c);
+        if (rc != EOK)
+                return rc;
+        if (!c)
+                return EOK;
+        return pci_config_space_read_8(sess, PCI_CAP_ID(*c), id);
+}
 
 /** PCI device communication interface. */