Changeset f834dd81 in mainline

Timestamp:

2017-10-31T19:24:58Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3654684

Parents:

eca820c (diff), 2b11c3c (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 OBIO DDF conversion.

Files:

• Makefile (modified) (1 diff)
• boot/arch/sparc64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/intctl/obio/Makefile (moved) (moved from uspace/srv/hw/irc/obio/Makefile ) (1 diff)
• uspace/drv/intctl/obio/main.c (added)
• uspace/drv/intctl/obio/obio.c (moved) (moved from uspace/srv/hw/irc/obio/obio.c ) (6 diffs)
• uspace/drv/intctl/obio/obio.h (added)
• uspace/drv/intctl/obio/obio.ma (added)
• uspace/drv/platform/sun4u/sun4u.c (modified) (3 diffs)

Makefile

@@ -1 @@
-#
+x#
 # Copyright (c) 2006 Martin Decky
 # All rights reserved.

boot/arch/sparc64/Makefile.inc

@@ -43 +43 @@
         bus/pci/pciintel \
         bus/isa \
+        intctl/obio \
         char/ns8250
 
 RD_DRV_CFG += \
         bus/isa
-
-RD_SRVS_NON_ESSENTIAL +=
-
-RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hw/irc/obio/obio
 
 SOURCES = \

uspace/Makefile

@@ -135 +135 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        srv/hw/irc/obio \
         srv/hid/rfb \
         drv/audio/hdaudio \
@@ -170 +169 @@
         drv/intctl/i8259 \
         drv/intctl/icp-ic \
+        drv/intctl/obio \
         drv/nic/ne2k \
         drv/nic/e1k \

uspace/drv/intctl/obio/Makefile

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../../../..
+USPACE_PREFIX = ../../..
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
 BINARY = obio
 
 SOURCES = \
+        main.c \
         obio.c
 

uspace/drv/intctl/obio/obio.c

@@ -42 +42 @@
  */
 
+#include <align.h>
+#include <as.h>
+#include <async.h>
+#include <ddf/driver.h>
+#include <ddf/log.h>
+#include <ddi.h>
+#include <errno.h>
+#include <inttypes.h>
 #include <ipc/irc.h>
-#include <loc.h>
-#include <as.h>
-#include <ddi.h>
-#include <align.h>
-#include <inttypes.h>
 #include <stdbool.h>
-#include <errno.h>
-#include <async.h>
-#include <align.h>
-#include <async.h>
 #include <stdio.h>
+
+#include "obio.h"
 
 #define NAME "obio"
@@ -67 +68 @@
 #define INO_MASK        0x1f
 
-static uintptr_t base_phys;
-static volatile uint64_t *base_virt = (volatile uint64_t *) AS_AREA_ANY;
-
 /** Handle one connection to obio.
  *
@@ -80 +78 @@
         ipc_callid_t callid;
         ipc_call_t call;
+        obio_t *obio;
 
         /*
@@ -86 +85 @@
         async_answer_0(iid, EOK);
 
+        obio = (obio_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
+
         while (1) {
                 int inr;
-        
+
                 callid = async_get_call(&call);
                 switch (IPC_GET_IMETHOD(call)) {
                 case IRC_ENABLE_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
-                        base_virt[OBIO_IMR(inr & INO_MASK)] |= (1UL << 31);
+                        ((volatile uint64_t *)(obio->regs))[OBIO_IMR(inr & INO_MASK)] |= (1UL << 31);
                         async_answer_0(callid, EOK);
                         break;
@@ -102 +103 @@
                 case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
-                        base_virt[OBIO_CIR(inr & INO_MASK)] = 0;
+                        ((volatile uint64_t *)(obio->regs))[OBIO_CIR(inr & INO_MASK)] = 0;
                         async_answer_0(callid, EOK);
                         break;
@@ -112 +113 @@
 }
 
-/** Initialize the OBIO driver.
- *
- * In the future, the OBIO driver should be integrated with the sun4u platform driver.
- */
-static bool obio_init(void)
+/** Add OBIO device. */
+int obio_add(obio_t *obio, obio_res_t *res)
 {
-        category_id_t irc_cat;
-        service_id_t svc_id;
+        ddf_fun_t *fun_a = NULL;
+        int flags;
+        int retval;
         int rc;
-        
-        base_phys = (uintptr_t) 0x1fe00000000ULL;
-        
-        int flags = AS_AREA_READ | AS_AREA_WRITE;
-        int retval = physmem_map(base_phys,
+
+        flags = AS_AREA_READ | AS_AREA_WRITE;
+        obio->regs = (volatile uint64_t *)AS_AREA_ANY;
+        retval = physmem_map(res->base,
             ALIGN_UP(OBIO_SIZE, PAGE_SIZE) >> PAGE_WIDTH, flags,
-            (void *) &base_virt);
-        
+            (void *) &obio->regs);
+
         if (retval < 0) {
-                printf("%s: Error mapping OBIO registers\n", NAME);
-                return false;
+                ddf_msg(LVL_ERROR, "Error mapping OBIO registers");
+                rc = EIO;
+                goto error;
         }
-        
-        printf("%s: OBIO registers with base at 0x%" PRIun "\n", NAME, base_phys);
-        
-        async_set_fallback_port_handler(obio_connection, NULL);
-        
-        rc = loc_server_register(NAME);
+
+        ddf_msg(LVL_NOTE, "OBIO registers with base at 0x%" PRIun, res->base);
+
+        fun_a = ddf_fun_create(obio->dev, fun_exposed, "a");
+        if (fun_a == NULL) {
+                ddf_msg(LVL_ERROR, "Failed creating function 'a'.");
+                rc = ENOMEM;
+                goto error;
+        }
+
+        ddf_fun_set_conn_handler(fun_a, obio_connection);
+
+        rc = ddf_fun_bind(fun_a);
         if (rc != EOK) {
-                printf("%s: Failed registering server. (%d)\n", NAME, rc);
-                return false;
+                ddf_msg(LVL_ERROR, "Failed binding function 'a'. (%d)", rc);
+                goto error;
         }
-        
-        rc = loc_service_register("irc/" NAME, &svc_id);
-        if (rc != EOK) {
-                printf("%s: Failed registering service. (%d)\n", NAME, rc);
-                return false;
-        }
-        
-        rc = loc_category_get_id("irc", &irc_cat, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Failed resolving category 'iplink' (%d).\n", NAME,
-                    rc);
-                return false;
-        }
-        
-        rc = loc_service_add_to_cat(svc_id, irc_cat);
-        if (rc != EOK) {
-                printf("%s: Failed adding service to category (%d).\n", NAME,
-                    rc);
-                return false;
-        }
-        
-        return true;
+
+        rc = ddf_fun_add_to_category(fun_a, "irc");
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        if (fun_a != NULL)
+                ddf_fun_destroy(fun_a);
+        return rc;
 }
 
-int main(int argc, char **argv)
+/** Remove OBIO device */
+int obio_remove(obio_t *obio)
 {
-        printf("%s: HelenOS OBIO driver\n", NAME);
-        
-        if (!obio_init())
-                return -1;
-        
-        printf("%s: Accepting connections\n", NAME);
-        task_retval(0);
-        async_manager();
-        
-        /* Never reached */
-        return 0;
+        return ENOTSUP;
 }
+
+/** OBIO device gone */
+int obio_gone(obio_t *obio)
+{
+        return ENOTSUP;
+}
+
 
 /**

uspace/drv/platform/sun4u/sun4u.c

@@ -68 +68 @@
 #define PBM_PCI_MEM_SIZE        UINT64_C(0x00100000000)
 
+#define PBM_OBIO_BASE           UINT64_C(0)
+#define PBM_OBIO_SIZE           UINT64_C(0x1898)
+
+
 typedef struct sun4u_fun {
         hw_resource_list_t hw_resources;
@@ -85 +89 @@
         .name = NAME,
         .driver_ops = &sun4u_ops
+};
+
+static hw_resource_t obio_res[] = {
+        {
+                .type = MEM_RANGE,
+                .res.mem_range = {
+                        .address = PBM_BASE + PBM_OBIO_BASE,
+                        .size = PBM_OBIO_SIZE,
+                        .relative = false,
+                        .endianness = LITTLE_ENDIAN
+                }
+        }
+};
+
+static sun4u_fun_t obio_data = {
+        .hw_resources = {
+                .count = sizeof(obio_res) / sizeof(obio_res[0]),
+                .resources = obio_res
+        },
+        .pio_window = {
+                .mem = {
+                        .base = PBM_BASE + PBM_OBIO_BASE,
+                        .size = PBM_OBIO_SIZE
+                }
+        }
 };
 
@@ -201 +230 @@
 static bool sun4u_add_functions(ddf_dev_t *dev)
 {
+        if (!sun4u_add_fun(dev, "obio", "ebus/obio", &obio_data))
+                return false;
+
         return sun4u_add_fun(dev, "pci0", "intel_pci", &pci_data);
 }