Changeset 9e9ced0 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:

d6c0016

Parents:

a86174ec

git-author:

Jakub Jermar <jakub@…> (2018-04-22 12:14:08)

git-committer:

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

Message:

Return also the size of the enabled resource

Location:

uspace

Files:

• drv/bus/pci/pciintel/pci.c (modified) (3 diffs)
• lib/c/generic/ddi.c (modified) (5 diffs)
• lib/c/include/ddi.h (modified) (1 diff)
• lib/virtio/virtio-pci.c (modified) (1 diff)

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

@@ -738 +738 @@
 
                 if (pio_enable_resource(&bus->pio_win,
-                    &hw_resources.resources[0],
-                    (void **) &bus->conf_space)) {
+                    &hw_resources.resources[0], (void **) &bus->conf_space,
+                    NULL)) {
                         ddf_msg(LVL_ERROR,
                             "Failed to map configuration space.");
@@ -759 +759 @@
 
                 if (pio_enable_resource(&bus->pio_win,
-                    &hw_resources.resources[0],
-                    (void **) &bus->conf_addr_reg)) {
+                    &hw_resources.resources[0], (void **) &bus->conf_addr_reg,
+                    NULL)) {
                         ddf_msg(LVL_ERROR,
                             "Failed to enable configuration ports.");
@@ -767 +767 @@
                 }
                 if (pio_enable_resource(&bus->pio_win,
-                    &hw_resources.resources[1],
-                    (void **) &bus->conf_data_reg)) {
+                    &hw_resources.resources[1], (void **) &bus->conf_data_reg,
+                    NULL)) {
                         ddf_msg(LVL_ERROR,
                             "Failed to enable configuration ports.");

uspace/lib/c/generic/ddi.c

@@ -220 +220 @@
 /** Enable PIO for specified HW resource wrt. to the PIO window.
  *
- * @param win      PIO window. May be NULL if the resources are known to be
- *                 absolute.
- * @param res      Resources specifying the I/O range wrt. to the PIO window.
- * @param virt     Virtual address for application's PIO operations.
+ * @param win        PIO window. May be NULL if the resources are known to be
+ *                   absolute.
+ * @param res        Resources specifying the I/O range wrt. to the PIO window.
+ * @param[out] virt  Virtual address for application's PIO operations.
+ * @param[out] size  If non-NULL, size of the enabled resource.
  *
  * @return EOK on success.
@@ -229 +230 @@
  *
  */
-errno_t pio_enable_resource(pio_window_t *win, hw_resource_t *res, void **virt)
+errno_t pio_enable_resource(pio_window_t *win, hw_resource_t *res, void **virt,
+    size_t *size)
 {
         uintptr_t addr;
-        size_t size;
+        size_t sz;
 
         switch (res->type) {
@@ -242 +244 @@
                         addr += win->io.base;
                 }
-                size = res->res.io_range.size;
+                sz = res->res.io_range.size;
                 break;
         case MEM_RANGE:
@@ -251 +253 @@
                         addr += win->mem.base;
                 }
-                size = res->res.mem_range.size;
+                sz = res->res.mem_range.size;
                 break;
         default:
@@ -257 +259 @@
         }
 
-        return pio_enable((void *) addr, size, virt);
+        if (size)
+                *size = sz;
+
+        return pio_enable((void *) addr, sz, virt);
 }
 

uspace/lib/c/include/ddi.h

@@ -64 +64 @@
 
 extern errno_t pio_enable_range(addr_range_t *, void **);
-extern errno_t pio_enable_resource(pio_window_t *, hw_resource_t *, void **);
+extern errno_t pio_enable_resource(pio_window_t *, hw_resource_t *, void **,
+    size_t *);
 extern errno_t pio_enable(void *, size_t, void **);
 extern errno_t pio_disable(void *, size_t);

uspace/lib/virtio/virtio-pci.c

@@ -143 +143 @@
 
                 rc = pio_enable_resource(&pio_window, &hw_res.resources[j],
-                    &vdev->bar[i].mapped_base);
+                    &vdev->bar[i].mapped_base, NULL);
                 if (rc == EOK)
                         vdev->bar[i].mapped = true;