Changeset c188c62 in mainline for uspace/drv/bus

Timestamp:

2017-10-05T18:00:52Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

81b9d3e

Parents:

e27e36e

Message:

CUDA driver should use hw_res to obtain HW configuration.

Location:

uspace/drv/bus/adb/cuda_adb

Files:

• cuda_adb.c (modified) (5 diffs)
• cuda_adb.h (modified) (3 diffs)
• main.c (modified) (3 diffs)

uspace/drv/bus/adb/cuda_adb/cuda_adb.c

@@ -148 +148 @@
 }
 
-int cuda_add(cuda_t *cuda)
+int cuda_add(cuda_t *cuda, cuda_res_t *res)
 {
         adb_dev_t *kbd = NULL;
@@ -154 +154 @@
         int rc;
 
+        cuda->phys_base = res->base;
+
         rc = cuda_dev_create(cuda, "kbd", &kbd);
         if (rc != EOK)
@@ -166 +168 @@
 
         cuda->addr_dev[9] = mouse;
-
 
         rc = cuda_init(cuda);
@@ -225 +226 @@
         int rc;
 
-        if (sysinfo_get_value("cuda.address.physical", &(cuda->cuda_physical)) != EOK)
-                return EIO;
-
         void *vaddr;
-        rc = pio_enable((void *) cuda->cuda_physical, sizeof(cuda_regs_t),
+        rc = pio_enable((void *) cuda->phys_base, sizeof(cuda_regs_t),
             &vaddr);
         if (rc != EOK)
@@ -244 +242 @@
         pio_write_8(&cuda->regs->ier, IER_CLR | ALL_INT);
 
-        cuda_irq_code.ranges[0].base = (uintptr_t) cuda->cuda_physical;
+        cuda_irq_code.ranges[0].base = (uintptr_t) cuda->phys_base;
         cuda_irq_code.cmds[0].addr = (void *) &((cuda_regs_t *)
-            cuda->cuda_physical)->ifr;
+            cuda->phys_base)->ifr;
         async_irq_subscribe(10, cuda_irq_handler, cuda, &cuda_irq_code);
 

uspace/drv/bus/adb/cuda_adb/cuda_adb.h

@@ -57 +57 @@
 };
 
+typedef struct {
+        uintptr_t base;
+        int irq;
+} cuda_res_t;
+
 /** ADB bus device */
 typedef struct {
@@ -68 +73 @@
 typedef struct cude {
         struct cuda_regs *regs;
-        uintptr_t cuda_physical;
+        uintptr_t phys_base;
         ddf_dev_t *dev;
 
@@ -82 +87 @@
 } cuda_t;
 
-extern int cuda_add(cuda_t *);
+extern int cuda_add(cuda_t *, cuda_res_t *);
 extern int cuda_remove(cuda_t *);
 extern int cuda_gone(cuda_t *);

uspace/drv/bus/adb/cuda_adb/main.c

@@ -35 +35 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <device/hw_res_parsed.h>
 #include <errno.h>
 #include <stdio.h>
@@ -61 +62 @@
 };
 
+static int cuda_get_res(ddf_dev_t *dev, cuda_res_t *res)
+{
+        async_sess_t *parent_sess;
+        hw_res_list_parsed_t hw_res;
+        int rc;
+
+        parent_sess = ddf_dev_parent_sess_create(dev);
+        if (parent_sess == NULL)
+                return ENOMEM;
+
+        hw_res_list_parsed_init(&hw_res);
+        rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        if (rc != EOK)
+                return rc;
+
+        if (hw_res.io_ranges.count != 1) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        res->base = RNGABS(hw_res.io_ranges.ranges[0]);
+
+        if (hw_res.irqs.count != 1) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        res->irq = hw_res.irqs.irqs[0];
+
+        return EOK;
+error:
+        hw_res_list_parsed_clean(&hw_res);
+        return rc;
+}
+
 static int cuda_dev_add(ddf_dev_t *dev)
 {
         cuda_t *cuda;
+        cuda_res_t cuda_res;
+        int rc;
 
-        printf("cuda_dev_add\n");
         ddf_msg(LVL_DEBUG, "cuda_dev_add(%p)", dev);
         cuda = ddf_dev_data_alloc(dev, sizeof(cuda_t));
@@ -75 +112 @@
         cuda->dev = dev;
         list_initialize(&cuda->devs);
-        printf("call cuda_add\n");
-        int rc = cuda_add(cuda);
-        printf("cuda_add->%d\n", rc);
-        return rc;
+
+        rc = cuda_get_res(dev, &cuda_res);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed getting hardware resource list.\n");
+                return EIO;
+        }
+
+        return cuda_add(cuda, &cuda_res);
 }