Changeset 6eeb4a3 in mainline for kernel/genarch/src/ddi/ddi-bitmap.c

Timestamp:

2014-08-18T21:18:27Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f93ba6d

Parents:

8cd680c

Message:

Deduplicate ddi_iospace_enable/disable_arch() code.

File:

• kernel/genarch/src/ddi/ddi-bitmap.c (moved) (moved from kernel/arch/ppc32/src/ddi/ddi.c ) (4 diffs)

kernel/genarch/src/ddi/ddi-bitmap.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32ddi
+/** @addtogroup amd64ddi
  * @{
  */
@@ -34 +34 @@
 
 #include <ddi/ddi.h>
+#include <arch/ddi/ddi.h>
 #include <proc/task.h>
 #include <typedefs.h>
+#include <adt/bitmap.h>
+#include <mm/slab.h>
+#include <arch/pm.h>
+#include <errno.h>
+#include <arch/cpu.h>
+#include <cpu.h>
+#include <arch.h>
+#include <align.h>
 
 /** Enable I/O space range for task.
@@ -45 +54 @@
  * @param size   Size of the enabled I/O range.
  *
- * @return 0 on success or an error code from errno.h.
+ * @return EOK on success or an error code from errno.h.
  *
  */
 int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
-        return 0;
+        size_t elements = ioaddr + size;
+        if (elements > IO_PORTS)
+                return ENOENT;
+        
+        if (task->arch.iomap.elements < elements) {
+                /*
+                 * The I/O permission bitmap is too small and needs to be grown.
+                 */
+                
+                void *store = malloc(bitmap_size(elements), FRAME_ATOMIC);
+                if (!store)
+                        return ENOMEM;
+                
+                bitmap_t oldiomap;
+                bitmap_initialize(&oldiomap, task->arch.iomap.elements,
+                    task->arch.iomap.bits);
+                
+                bitmap_initialize(&task->arch.iomap, elements, store);
+                
+                /*
+                 * Mark the new range inaccessible.
+                 */
+                bitmap_set_range(&task->arch.iomap, oldiomap.elements,
+                    elements - oldiomap.elements);
+                
+                /*
+                 * In case there really existed smaller iomap,
+                 * copy its contents and deallocate it.
+                 */
+                if (oldiomap.bits) {
+                        bitmap_copy(&task->arch.iomap, &oldiomap,
+                            oldiomap.elements);
+                        
+                        free(oldiomap.bits);
+                }
+        }
+        
+        /*
+         * Enable the range and we are done.
+         */
+        bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, size);
+        
+        /*
+         * Increment I/O Permission bitmap generation counter.
+         */
+        task->arch.iomapver++;
+        
+        return EOK;
 }
 
@@ -59 +115 @@
  * @param task   Task.
  * @param ioaddr Starting I/O space address.
- * @param size   Size of the disabled I/O range.
+ * @param size   Size of the enabled I/O range.
  *
- * @return 0 on success or an error code from errno.h.
+ * @return EOK on success or an error code from errno.h.
  *
  */
 int ddi_iospace_disable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
+        size_t elements = ioaddr + size;
+        if (elements > IO_PORTS)
+                return ENOENT;
+        
+        if (ioaddr >= task->arch.iomap.elements)
+                return EINVAL;  
+
+        if (task->arch.iomap.elements < elements)
+                size -= elements - task->arch.iomap.elements;
+
+        /*
+         * Disable the range.
+         */
+        bitmap_set_range(&task->arch.iomap, (size_t) ioaddr, size);
+        
+        /*
+         * Increment I/O Permission bitmap generation counter.
+         */
+        task->arch.iomapver++;
+        
         return 0;
 }