Changes in kernel/arch/ia32/src/ddi/ddi.c [e9e5b9ab:98000fb] in mainline

File:

• kernel/arch/ia32/src/ddi/ddi.c (modified) (6 diffs)

kernel/arch/ia32/src/ddi/ddi.c

@@ -36 +36 @@
 #include <arch/ddi/ddi.h>
 #include <proc/task.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <adt/bitmap.h>
 #include <mm/slab.h>
@@ -50 +50 @@
  * Interrupts are disabled and task is locked.
  *
- * @param task   Task.
+ * @param task Task.
  * @param ioaddr Startign I/O space address.
- * @param size   Size of the enabled I/O range.
+ * @param size Size of the enabled I/O range.
  *
  * @return 0 on success or an error code from errno.h.
- *
  */
 int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
-        size_t bits = ioaddr + size;
+        size_t bits;
+
+        bits = ioaddr + size;
         if (bits > IO_PORTS)
                 return ENOENT;
+
+        if (task->arch.iomap.bits < bits) {
+                bitmap_t oldiomap;
+                uint8_t *newmap;
         
-        if (task->arch.iomap.bits < bits) {
                 /*
                  * The I/O permission bitmap is too small and needs to be grown.
                  */
                 
-                uint8_t *newmap = (uint8_t *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
+                newmap = (uint8_t *) malloc(BITS2BYTES(bits), FRAME_ATOMIC);
                 if (!newmap)
                         return ENOMEM;
                 
-                bitmap_t oldiomap;
                 bitmap_initialize(&oldiomap, task->arch.iomap.map,
                     task->arch.iomap.bits);
                 bitmap_initialize(&task->arch.iomap, newmap, bits);
-                
+
                 /*
                  * Mark the new range inaccessible.
@@ -82 +85 @@
                 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,
@@ -93 +96 @@
                 }
         }
-        
+
         /*
          * Enable the range and we are done.
          */
         bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, (size_t) size);
-        
+
         /*
          * Increment I/O Permission bitmap generation counter.
          */
         task->arch.iomapver++;
-        
+
         return 0;
 }
@@ -113 +116 @@
  *
  * Interrupts must be disabled prior this call.
- *
  */
 void io_perm_bitmap_install(void)
 {
+        size_t bits;
+        ptr_16_32_t cpugdtr;
+        descriptor_t *gdt_p;
+        size_t ver;
+
         /* 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) {
+        spinlock_lock(&TASK->lock);
+        ver = TASK->arch.iomapver;
+        if ((bits = TASK->arch.iomap.bits)) {
+                bitmap_t iomap;
+                task_t *task = TASK;
+        
                 ASSERT(TASK->arch.iomap.map);
-                
-                bitmap_t iomap;
                 bitmap_initialize(&iomap, CPU->arch.tss->iomap,
                     TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, bits);
-                
-                /*
-                 * Set the trailing bits in the last byte of the map to disable
-                 * I/O access.
-                 */
-                bitmap_set_range(&iomap, bits, ALIGN_UP(bits, 8) - bits);
+                bitmap_copy(&iomap, &task->arch.iomap, task->arch.iomap.bits);
                 /*
                  * 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(TASK->arch.iomap.bits, 8), 8);
         }
-        irq_spinlock_unlock(&TASK->lock, false);
-        
+        spinlock_unlock(&TASK->lock);
+
         /*
          * Second, adjust TSS segment limit.
          * Take the extra ending byte with all bits set into account.
          */
-        ptr_16_32_t cpugdtr;
         gdtr_store(&cpugdtr);
-        
-        descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base;
+        gdt_p = (descriptor_t *) cpugdtr.base;
         gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + BITS2BYTES(bits));
         gdtr_load(&cpugdtr);
-        
+
         /*
          * Before we load new TSS limit, the current TSS descriptor
@@ -158 +157 @@
          */
         gdt_p[TSS_DES].access = AR_PRESENT | AR_TSS | DPL_KERNEL;
-        tr_load(GDT_SELECTOR(TSS_DES));
+        tr_load(gdtselector(TSS_DES));
         
         /*