Changeset 19d2ce01 in mainline for uspace/drv/char/sun4v-con

Timestamp:

2017-11-16T09:51:14Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

92232331

Parents:

ce96ec2

git-author:

Jiri Svoboda <jiri@…> (2017-11-15 21:50:05)

git-committer:

Jiri Svoboda <jiri@…> (2017-11-16 09:51:14)

Message:

Sun4v console driver can use hw_res for configuration.

Location:

uspace/drv/char/sun4v-con

Files:

• main.c (modified) (3 diffs)
• sun4v-con.c (modified) (3 diffs)
• sun4v-con.h (modified) (1 diff)

uspace/drv/char/sun4v-con/main.c

@@ -32 +32 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <device/hw_res_parsed.h>
 #include <errno.h>
 #include <stdio.h>
@@ -58 +59 @@
 };
 
+static int sun4v_con_get_res(ddf_dev_t *dev, sun4v_con_res_t *res)
+{
+        async_sess_t *parent_sess;
+        hw_res_list_parsed_t hw_res;
+        int rc;
+
+        parent_sess = ddf_dev_parent_sess_get(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.mem_ranges.count != 1) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        res->base = RNGABS(hw_res.mem_ranges.ranges[0]);
+        return EOK;
+error:
+        hw_res_list_parsed_clean(&hw_res);
+        return rc;
+}
+
+
 static int sun4v_con_dev_add(ddf_dev_t *dev)
 {
         sun4v_con_t *sun4v_con;
+        sun4v_con_res_t res;
+        int rc;
 
         ddf_msg(LVL_DEBUG, "sun4v_con_dev_add(%p)", dev);
@@ -71 +102 @@
         sun4v_con->dev = dev;
 
-        return sun4v_con_add(sun4v_con);
+        rc = sun4v_con_get_res(dev, &res);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed getting hardware resource list.\n");
+                return EIO;
+        }
+
+        return sun4v_con_add(sun4v_con, &res);
 }
 

uspace/drv/char/sun4v-con/sun4v-con.c

@@ -38 +38 @@
 #include <ipc/char.h>
 #include <stdbool.h>
-#include <sysinfo.h>
 #include <thread.h>
 
@@ -72 +71 @@
 
 /** Add sun4v console device. */
-int sun4v_con_add(sun4v_con_t *con)
+int sun4v_con_add(sun4v_con_t *con, sun4v_con_res_t *res)
 {
         ddf_fun_t *fun = NULL;
         int rc;
 
+        con->res = *res;
         input_buffer = (input_buffer_t) AS_AREA_ANY;
 
@@ -88 +88 @@
         ddf_fun_set_conn_handler(fun, sun4v_con_connection);
 
-        sysarg_t paddr;
-        rc = sysinfo_get_value("niagara.inbuf.address", &paddr);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "niagara.inbuf.address not set (%d)", rc);
-                goto error;
-        }
-
-        rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE,
+        rc = physmem_map(res->base, 1, AS_AREA_READ | AS_AREA_WRITE,
             (void *) &input_buffer);
         if (rc != EOK) {

uspace/drv/char/sun4v-con/sun4v-con.h

@@ -41 +41 @@
 #include <stdint.h>
 
+/** Sun4v console resources */
+typedef struct {
+        uintptr_t base;
+} sun4v_con_res_t;
+
 /** Sun4v console */
 typedef struct {
         async_sess_t *client_sess;
         ddf_dev_t *dev;
+        sun4v_con_res_t res;
 } sun4v_con_t;
 
-extern int sun4v_con_init(sun4v_con_t *);
-extern void sun4v_con_write(uint8_t data);
-
-
-extern int sun4v_con_add(sun4v_con_t *);
+extern int sun4v_con_add(sun4v_con_t *, sun4v_con_res_t *);
 extern int sun4v_con_remove(sun4v_con_t *);
 extern int sun4v_con_gone(sun4v_con_t *);