Changeset 19d2ce01 in mainline for uspace/drv/platform

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/platform

Files:

• msim/msim.c (modified) (3 diffs)
• sun4v/sun4v.c (modified) (8 diffs)

uspace/drv/platform/msim/msim.c

@@ -65 +65 @@
 static void msim_init(void);
 
-/** The root device driver's standard operations. */
+/** Standard driver operations. */
 static driver_ops_t msim_ops = {
         .dev_add = &msim_dev_add
 };
 
-/** The root device driver structure. */
+/** Driver structure. */
 static driver_t msim_driver = {
         .name = NAME,
@@ -194 +194 @@
         
         msim_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(msim_fun_t));
+        if (fun == NULL)
+                goto failure;
+        
         *fun = *fun_proto;
         
@@ -230 +233 @@
 }
 
-/** Get the root device.
- *
- * @param dev           The device which is root of the whole device tree (both
- *                      of HW and pseudo devices).
- * @return              Zero on success, negative error number otherwise.
+/** Add MSIM platform device.
+ *
+ * @param dev DDF device
+ * @return Zero on success or non-zero error code.
  */
 static int msim_dev_add(ddf_dev_t *dev)

uspace/drv/platform/sun4v/sun4v.c

@@ -36 +36 @@
  */
 
+#include <as.h>
 #include <assert.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <errno.h>
+#include <ops/hw_res.h>
+#include <ops/pio_window.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sysinfo.h>
 
 #define NAME "sun4v"
+
+typedef struct sun4v_fun {
+        hw_resource_list_t hw_resources;
+        pio_window_t pio_window;
+} sun4v_fun_t;
 
 static int sun4v_dev_add(ddf_dev_t *dev);
@@ -57 +65 @@
 };
 
-static int sun4v_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id)
+static hw_resource_t console_res[] = {
+        {
+                .type = MEM_RANGE,
+                .res.mem_range = {
+                        .address = 0,
+                        .size = PAGE_SIZE,
+                        .relative = true,
+                        .endianness = LITTLE_ENDIAN
+                }
+        },
+};
+
+static sun4v_fun_t console_data = {
+        .hw_resources = {
+                sizeof(console_res) / sizeof(console_res[0]),
+                console_res
+        },
+        .pio_window = {
+                .mem = {
+                        .base = 0,
+                        .size = PAGE_SIZE
+                }
+        }
+};
+
+/** Obtain function soft-state from DDF function node */
+static sun4v_fun_t *sun4v_fun(ddf_fun_t *fnode)
+{
+        return ddf_fun_data_get(fnode);
+}
+
+static hw_resource_list_t *sun4v_get_resources(ddf_fun_t *fnode)
+{
+        sun4v_fun_t *fun = sun4v_fun(fnode);
+
+        assert(fun != NULL);
+        return &fun->hw_resources;
+}
+
+static int sun4v_enable_interrupt(ddf_fun_t *fun, int irq)
+{
+        return true;
+}
+
+static pio_window_t *sun4v_get_pio_window(ddf_fun_t *fnode)
+{
+        sun4v_fun_t *fun = sun4v_fun(fnode);
+
+        assert(fun != NULL);
+        return &fun->pio_window;
+}
+
+static hw_res_ops_t fun_hw_res_ops = {
+        .get_resource_list = &sun4v_get_resources,
+        .enable_interrupt = &sun4v_enable_interrupt,
+};
+
+static pio_window_ops_t fun_pio_window_ops = {
+        .get_pio_window = &sun4v_get_pio_window
+};
+
+static ddf_dev_ops_t sun4v_fun_ops;
+
+static int sun4v_add_fun(ddf_dev_t *dev, const char *name,
+    const char *str_match_id, sun4v_fun_t *fun_proto)
 {
         ddf_msg(LVL_NOTE, "Adding function '%s'.", name);
@@ -72 +144 @@
         }
 
+        sun4v_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(sun4v_fun_t));
+        if (fun == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        *fun = *fun_proto;
+
         /* Add match ID */
         rc = ddf_fun_add_match_id(fnode, str_match_id, 100);
@@ -79 +159 @@
         }
 
+        /* Set provided operations to the device. */
+        ddf_fun_set_ops(fnode, &sun4v_fun_ops);
+
         /* Register function. */
-        if (ddf_fun_bind(fnode) != EOK) {
+        rc = ddf_fun_bind(fnode);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed binding function %s.", name);
                 goto error;
@@ -98 +182 @@
         int rc;
 
-        rc = sun4v_add_fun(dev, "console", "sun4v/console");
+        rc = sun4v_add_fun(dev, "console", "sun4v/console", &console_data);
         if (rc != EOK)
                 return rc;
@@ -108 +192 @@
 static int sun4v_dev_add(ddf_dev_t *dev)
 {
-        ddf_msg(LVL_NOTE, "sun4v_dev_add, device handle = %d",
+        ddf_msg(LVL_DEBUG, "sun4v_dev_add, device handle = %d",
             (int)ddf_dev_get_handle(dev));
 
@@ -119 +203 @@
 }
 
+static int sun4v_init(void)
+{
+        int rc;
+        sysarg_t paddr;
+
+        sun4v_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
+        sun4v_fun_ops.interfaces[PIO_WINDOW_DEV_IFACE] = &fun_pio_window_ops;
+
+        rc = ddf_log_init(NAME);
+        if (rc != EOK) {
+                printf(NAME ": Failed initializing logging service\n");
+                return rc;
+        }
+
+        rc = sysinfo_get_value("niagara.inbuf.address", &paddr);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "niagara.inbuf.address not set (%d)", rc);
+                return rc;
+        }
+
+        console_data.pio_window.mem.base = paddr;
+        return EOK;
+}
+
 int main(int argc, char *argv[])
 {
@@ -125 +233 @@
         printf(NAME ": Sun4v platform driver\n");
 
-        rc = ddf_log_init(NAME);
-        if (rc != EOK) {
-                printf(NAME ": Failed initializing logging service");
+        rc = sun4v_init();
+        if (rc != EOK)
                 return 1;
-        }
 
         return ddf_driver_main(&sun4v_driver);