Changeset fbcdeb8 in mainline for uspace/srv/hid/fb/port

Timestamp:

2011-12-19T17:30:39Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

58f6229

Parents:

24cf31f1

Message:

Remove the two-phase way of creating virtual memory areas (first asking for a mappable address and then mapping it) which was prone to race conditions when two or more calls to as_get_mappable_page() and as_area_create() were interleaved. This for example caused the e1k driver to randomly fail.

The memory area related syscalls and IPC calls have all been altered to accept a special value (void *) -1, representing a demand to atomically search for a mappable address space "hole" and map to it.

Individual changes:

• IPC_M_SHARE_OUT: the destination address space area is supplied by the kernel, the callee only specifies the lower bound

(the address is returned to the callee via a pointer in an IPC reply argument)

• IPC_M_SHARE_IN: the destination address space ares is supplied by the kernel, the callee only specifies the lower bound

(the address is returned to the caller as usual via an IPC argument)

• SYS_AS_GET_UNMAPPED_AREA was removed
• dummy implementations of SYS_PHYSMEM_UNMAP and SYS_IOSPACE_DISABLE were added for the sake of symmetry (they do nothing yet)
• SYS_PHYSMEM_MAP and SYS_DMAMEM_MAP were altered to accept (void *) -1 as address space area base and a lower bound
• kernel as_area_create() and as_area_share() were altered to accept (void *) -1 as address space area base and a lower bound
• uspace libraries and programs were altered to reflect the new API

Location:

uspace/srv/hid/fb/port

Files:

• ega.c (modified) (1 diff)
• kchar.c (modified) (1 diff)
• kfb.c (modified) (1 diff)
• niagara.c (modified) (1 diff)

uspace/srv/hid/fb/port/ega.c

@@ -280 +280 @@
         
         ega.size = (width * height) << 1;
-        ega.addr = as_get_mappable_page(ega.size);
-        if (ega.addr == NULL)
-                return ENOMEM;
-        
-        rc = physmem_map((void *) paddr, ega.addr,
-            ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        
+        rc = physmem_map((void *) paddr,
+            ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &ega.addr);
         if (rc != EOK)
                 return rc;

uspace/srv/hid/fb/port/kchar.c

@@ -83 +83 @@
                 return rc;
         
-        kchar.addr = as_get_mappable_page(1);
-        if (kchar.addr == NULL)
-                return ENOMEM;
-        
-        rc = physmem_map((void *) paddr, kchar.addr,
-            ALIGN_UP(1, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        rc = physmem_map((void *) paddr,
+            ALIGN_UP(1, PAGE_SIZE) >> PAGE_WIDTH,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &kchar.addr);
         if (rc != EOK)
                 return rc;

uspace/srv/hid/fb/port/kfb.c

@@ -756 +756 @@
         
         kfb.size = scanline * height;
-        kfb.addr = as_get_mappable_page(kfb.size);
-        if (kfb.addr == NULL) {
-                free(kfb.glyphs);
-                return ENOMEM;
-        }
-        
-        rc = physmem_map((void *) paddr + offset, kfb.addr,
-            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        
+        rc = physmem_map((void *) paddr + offset,
+            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb.addr);
         if (rc != EOK) {
                 free(kfb.glyphs);

uspace/srv/hid/fb/port/niagara.c

@@ -103 +103 @@
                 return rc;
         
-        niagara.fifo =
-            (output_fifo_t *) as_get_mappable_page(sizeof(output_fifo_t));
-        if (niagara.fifo == NULL)
-                return ENOMEM;
-        
-        rc = physmem_map((void *) paddr, (void *) niagara.fifo, 1,
-            AS_AREA_READ | AS_AREA_WRITE);
+        rc = physmem_map((void *) paddr, 1,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &niagara.fifo);
         if (rc != EOK)
                 return rc;