Changeset 46e886f in mainline

Timestamp:

2019-04-06T16:10:08Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

82dcd25

Parents:

69c31abc

Message:

Add port/MM IO agnostic functions to map/unmap PIO

In kernel we have drivers that use port IO on one architecture and
MM IO on another. We therefore need some function which does the right
thing depending on the type of the register address.

Location:

kernel/generic

Files:

• include/ddi/ddi.h (modified) (1 diff)
• src/ddi/ddi.c (modified) (3 diffs)

kernel/generic/include/ddi/ddi.h

@@ -60 +60 @@
 extern void ddi_parea_register(parea_t *);
 
+extern void *pio_map(void *, size_t);
+extern void pio_unmap(void *, void *, size_t);
+
 extern sys_errno_t sys_physmem_map(uintptr_t, size_t, unsigned int, void *,
     uintptr_t);

kernel/generic/src/ddi/ddi.c

@@ -46 +46 @@
 #include <mm/frame.h>
 #include <mm/as.h>
+#include <mm/km.h>
 #include <mm/page.h>
 #include <synch/mutex.h>
@@ -56 +57 @@
 #include <trace.h>
 #include <bitops.h>
+#include <arch/asm.h>
 
 /** This lock protects the @c pareas ordered dictionary. */
@@ -527 +529 @@
                 return dmamem_unmap_anonymous(virt);
 }
+void *pio_map(void *phys, size_t size)
+{
+#ifdef IO_SPACE_BOUNDARY
+        if (phys < IO_SPACE_BOUNDARY)
+                return phys;
+#endif
+        return (void *) km_map((uintptr_t) phys, size, KM_NATURAL_ALIGNMENT,
+            PAGE_READ | PAGE_WRITE | PAGE_NOT_CACHEABLE);
+}
+
+void pio_unmap(void *phys, void *virt, size_t size)
+{
+#ifdef IO_SPACE_BOUNDARY
+        if (phys < IO_SPACE_BOUNDARY)
+                return;
+#endif
+        km_unmap((uintptr_t) virt, size);
+}
 
 /** @}