Changeset 2b11c3c in mainline

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f834dd81

Parents:

48adf0f

Message:

OBIO should not store base address in a global variable.

Files:

• Makefile (modified) (1 diff)
• uspace/drv/intctl/obio/obio.c (modified) (7 diffs)
• uspace/drv/intctl/obio/obio.h (modified) (1 diff)

Makefile

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

uspace/drv/intctl/obio/obio.c

@@ -68 +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.
  *
@@ -81 +78 @@
         ipc_callid_t callid;
         ipc_call_t call;
+        obio_t *obio;
 
         /*
@@ -86 +84 @@
          */
         async_answer_0(iid, EOK);
+
+        obio = (obio_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
 
         while (1) {
@@ -94 +94 @@
                 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;
@@ -103 +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;
@@ -117 +117 @@
 {
         ddf_fun_t *fun_a = NULL;
+        int flags;
+        int retval;
         int rc;
 
-        int flags = AS_AREA_READ | AS_AREA_WRITE;
-        int retval = physmem_map(res->base,
+        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) {
@@ -130 +133 @@
         }
 
-        ddf_msg(LVL_NOTE, "OBIO registers with base at 0x%" PRIun, base_phys);
+        ddf_msg(LVL_NOTE, "OBIO registers with base at 0x%" PRIun, res->base);
 
         fun_a = ddf_fun_create(obio->dev, fun_exposed, "a");

uspace/drv/intctl/obio/obio.h

@@ -47 +47 @@
 /** OBIO */
 typedef struct {
-        ioport32_t *regs;
+        volatile uint64_t *regs;
         uintptr_t phys_base;
         ddf_dev_t *dev;