Changeset 73e9b49 in mainline

Timestamp:

2006-04-17T16:24:04Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

17b1b99

Parents:

9fa16b20

Message:

Full implementation of amd64 and ia32 SYS_ENABLE_IOSPACE syscall.
Needs testing.

Location:

arch

Files:

• amd64/include/pm.h (modified) (1 diff)
• amd64/src/ddi/ddi.c (modified) (2 diffs)
• ia32/include/pm.h (modified) (1 diff)
• ia32/src/ddi/ddi.c (modified) (2 diffs)

arch/amd64/include/pm.h

@@ -69 +69 @@
 #define TSS_BASIC_SIZE  104
 #define TSS_IOMAP_SIZE  (16*1024+1)     /* 16K for bitmap + 1 terminating byte for convenience */
+
+#define IO_PORTS        (64*1024)
 
 #ifndef __ASM__

arch/amd64/src/ddi/ddi.c

@@ -31 +31 @@
 #include <arch/types.h>
 #include <typedefs.h>
+#include <adt/bitmap.h>
+#include <mm/slab.h>
+#include <arch/pm.h>
+#include <errno.h>
 
 /** Enable I/O space range for task.
@@ -44 +48 @@
 int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
 {
+        count_t bits;
+
+        bits = ioaddr + size;
+        if (bits > IO_PORTS)
+                return ENOENT;
+
+        if (task->arch.iomap.bits < bits) {
+                bitmap_t oldiomap;
+                __u8 *newmap;
+        
+                /*
+                 * The I/O permission bitmap is too small and needs to be grown.
+                 */
+                
+                newmap = (__u8 *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
+                if (!newmap)
+                        return ENOMEM;
+                
+                bitmap_initialize(&oldiomap, task->arch.iomap.map, task->arch.iomap.bits);
+                bitmap_initialize(&task->arch.iomap, newmap, bits);
+
+                /*
+                 * Mark the new range inaccessible.
+                 */
+                bitmap_set_range(&task->arch.iomap, oldiomap.bits, bits - oldiomap.bits);
+
+                /*
+                 * In case there really existed smaller iomap,
+                 * copy its contents and deallocate it.
+                 */             
+                if (oldiomap.bits) {
+                        bitmap_copy(&task->arch.iomap, &oldiomap, task->arch.iomap.bits);
+                        free(oldiomap.map);
+                }
+        }
+
+        /*
+         * Enable the range and we are done.
+         */
+        bitmap_clear_range(&task->arch.iomap, (index_t) ioaddr, (count_t) size);
+
         return 0;
 }

arch/ia32/include/pm.h

@@ -58 +58 @@
 #define TSS_BASIC_SIZE  104
 #define TSS_IOMAP_SIZE  (16*1024+1)     /* 16K for bitmap + 1 terminating byte for convenience */
+
+#define IO_PORTS        (64*1024)
 
 #ifndef __ASM__

arch/ia32/src/ddi/ddi.c

@@ -31 +31 @@
 #include <arch/types.h>
 #include <typedefs.h>
+#include <adt/bitmap.h>
+#include <mm/slab.h>
+#include <arch/pm.h>
+#include <errno.h>
 
 /** Enable I/O space range for task.
@@ -44 +48 @@
 int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
 {
+        count_t bits;
+
+        bits = ioaddr + size;
+        if (bits > IO_PORTS)
+                return ENOENT;
+
+        if (task->arch.iomap.bits < bits) {
+                bitmap_t oldiomap;
+                __u8 *newmap;
+        
+                /*
+                 * The I/O permission bitmap is too small and needs to be grown.
+                 */
+                
+                newmap = (__u8 *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
+                if (!newmap)
+                        return ENOMEM;
+                
+                bitmap_initialize(&oldiomap, task->arch.iomap.map, task->arch.iomap.bits);
+                bitmap_initialize(&task->arch.iomap, newmap, bits);
+
+                /*
+                 * Mark the new range inaccessible.
+                 */
+                bitmap_set_range(&task->arch.iomap, oldiomap.bits, bits - oldiomap.bits);
+
+                /*
+                 * In case there really existed smaller iomap,
+                 * copy its contents and deallocate it.
+                 */             
+                if (oldiomap.bits) {
+                        bitmap_copy(&task->arch.iomap, &oldiomap, task->arch.iomap.bits);
+                        free(oldiomap.map);
+                }
+        }
+
+        /*
+         * Enable the range and we are done.
+         */
+        bitmap_clear_range(&task->arch.iomap, (index_t) ioaddr, (count_t) size);
+
         return 0;
 }