Changeset 99c2c69e in mainline for kernel/arch/amd64/src/ddi/ddi.c

Timestamp:

2013-09-13T00:36:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

File:

• kernel/arch/amd64/src/ddi/ddi.c (modified) (7 diffs)

kernel/arch/amd64/src/ddi/ddi.c

@@ -42 +42 @@
 #include <errno.h>
 #include <arch/cpu.h>
+#include <cpu.h>
 #include <arch.h>
 #include <align.h>
@@ -58 +59 @@
 int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
-        size_t bits = ioaddr + size;
-        if (bits > IO_PORTS)
+        size_t elements = ioaddr + size;
+        if (elements > IO_PORTS)
                 return ENOENT;
         
-        if (task->arch.iomap.bits < bits) {
+        if (task->arch.iomap.elements < elements) {
                 /*
                  * The I/O permission bitmap is too small and needs to be grown.
                  */
                 
-                uint8_t *newmap = (uint8_t *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
-                if (!newmap)
+                void *store = malloc(bitmap_size(elements), FRAME_ATOMIC);
+                if (!store)
                         return ENOMEM;
                 
                 bitmap_t oldiomap;
-                bitmap_initialize(&oldiomap, task->arch.iomap.map,
+                bitmap_initialize(&oldiomap, task->arch.iomap.elements,
                     task->arch.iomap.bits);
-                bitmap_initialize(&task->arch.iomap, newmap, bits);
+                
+                bitmap_initialize(&task->arch.iomap, elements, store);
                 
                 /*
                  * Mark the new range inaccessible.
                  */
-                bitmap_set_range(&task->arch.iomap, oldiomap.bits,
-                    bits - oldiomap.bits);
+                bitmap_set_range(&task->arch.iomap, oldiomap.elements,
+                    elements - oldiomap.elements);
                 
                 /*
@@ -88 +90 @@
                 if (oldiomap.bits) {
                         bitmap_copy(&task->arch.iomap, &oldiomap,
-                            oldiomap.bits);
-                        free(oldiomap.map);
+                            oldiomap.elements);
+                        
+                        free(oldiomap.bits);
                 }
         }
@@ -96 +99 @@
          * Enable the range and we are done.
          */
-        bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, (size_t) size);
+        bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, size);
         
         /*
@@ -118 +121 @@
         /* First, copy the I/O Permission Bitmap. */
         irq_spinlock_lock(&TASK->lock, false);
+        
         size_t ver = TASK->arch.iomapver;
-        size_t bits = TASK->arch.iomap.bits;
-        if (bits) {
-                ASSERT(TASK->arch.iomap.map);
+        size_t elements = TASK->arch.iomap.elements;
+        
+        if (elements > 0) {
+                ASSERT(TASK->arch.iomap.bits);
                 
                 bitmap_t iomap;
-                bitmap_initialize(&iomap, CPU->arch.tss->iomap,
-                    TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, bits);
+                bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8,
+                    CPU->arch.tss->iomap);
+                bitmap_copy(&iomap, &TASK->arch.iomap, elements);
                 
                 /*
@@ -132 +137 @@
                  * I/O access.
                  */
-                bitmap_set_range(&iomap, bits, ALIGN_UP(bits, 8) - bits);
+                bitmap_set_range(&iomap, elements,
+                    ALIGN_UP(elements, 8) - elements);
+                
                 /*
                  * It is safe to set the trailing eight bits because of the
                  * extra convenience byte in TSS_IOMAP_SIZE.
                  */
-                bitmap_set_range(&iomap, ALIGN_UP(bits, 8), 8);
+                bitmap_set_range(&iomap, ALIGN_UP(elements, 8), 8);
         }
+        
         irq_spinlock_unlock(&TASK->lock, false);
         
         /*
          * Second, adjust TSS segment limit.
-         * Take the extra ending byte will all bits set into account. 
+         * Take the extra ending byte with all bits set into account.
          */
         ptr_16_64_t cpugdtr;
@@ -149 +157 @@
         
         descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base;
-        gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits));
+        size_t size = bitmap_size(elements);
+        gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + size);
         gdtr_load(&cpugdtr);